rm force lock

Author: art22m

database/ydb/README.md

@@ -10,16 +10,15 @@
 |   `port`   |          The port to bind to.           |                                     
 | `database` | The name of the database to connect to. |
 
-|       URL Query Params       |                                                        Description                                                         |
-|:----------------------------:|:--------------------------------------------------------------------------------------------------------------------------:|
-|        `x-auth-token`        |                                                   Authentication token.                                                    |
-|     `x-migrations-table`     |                                Name of the migrations table (default `schema_migrations`).                                 |
-|        `x-lock-table`        |                       Name of the table which maintains the migration lock (default `schema_lock`).                        |
-|        `x-force-lock`        | Enables force lock acquisition to fix faulty migrations which may not have released the schema lock (disabled by default). |
-|        `x-use-grpcs`         |                                 Enables gRPCS protocol for YDB connections (default grpc).                                 |
-|          `x-tls-ca`          |                                    The location of the CA (certificate authority) file.                                    |
-| `x-tls-insecure-skip-verify` |                      Controls whether a client verifies the server's certificate chain and host name.                      |
-|     `x-tls-min-version`      |                Controls the minimum TLS version that is acceptable, use 1.0, 1.1, 1.2 or 1.3 (default 1.2).                |
+|       URL Query Params       |                                         Description                                          |
+|:----------------------------:|:--------------------------------------------------------------------------------------------:|
+|        `x-auth-token`        |                                    Authentication token.                                     |
+|     `x-migrations-table`     |                 Name of the migrations table (default `schema_migrations`).                  |
+|        `x-lock-table`        |        Name of the table which maintains the migration lock (default `schema_lock`).         |
+|        `x-use-grpcs`         |                  Enables gRPCS protocol for YDB connections (default grpc).                  |
+|          `x-tls-ca`          |                     The location of the CA (certificate authority) file.                     |
+| `x-tls-insecure-skip-verify` |       Controls whether a client verifies the server's certificate chain and host name.       |
+|     `x-tls-min-version`      | Controls the minimum TLS version that is acceptable, use 1.0, 1.1, 1.2 or 1.3 (default 1.2). |
 
 ### Secure connection
 
@@ -39,4 +38,11 @@ Through the url query, you can change the default behavior:
   `ydb://user:password@host:port/database`
 - To connect to YDB using [token](https://ydb.tech/docs/en/recipes/ydb-sdk/auth-access-token) you need to specify token
   as query parameter:
-  `ydb://host:port/database?x-auth-token=<YDB_TOKEN>`
+  `ydb://host:port/database?x-auth-token=<YDB_TOKEN>`
+
+### Locks
+
+If golang-migrate fails to acquire the lock and no migrations are currently running.
+This may indicate that one of the migrations did not complete successfully.
+In this case, you need to analyze the previous migrations, rollback if necessary, and manually remove the lock from the
+`x-lock-table`. 

database/ydb/ydb.go

@@ -29,7 +29,6 @@ const (
 	queryParamAuthToken                 = "x-auth-token"
 	queryParamMigrationsTable           = "x-migrations-table"
 	queryParamLockTable                 = "x-lock-table"
-	queryParamForceLock                 = "x-force-lock"
 	queryParamUseGRPCS                  = "x-use-grpcs"
 	queryParamTLSCertificateAuthorities = "x-tls-ca"
 	queryParamTLSInsecureSkipVerify     = "x-tls-insecure-skip-verify"
@@ -46,7 +45,6 @@ type Config struct {
 	MigrationsTable string
 	LockTable       string
 	DatabaseName    string
-	ForceLock       bool
 }
 
 type YDB struct {
@@ -144,7 +142,6 @@ func (y *YDB) Open(dsn string) (database.Driver, error) {
 		MigrationsTable: pquery.Get(queryParamMigrationsTable),
 		LockTable:       pquery.Get(queryParamLockTable),
 		DatabaseName:    purl.Path,
-		ForceLock:       pquery.Has(queryParamForceLock),
 	})
 	if err != nil {
 		return nil, err
@@ -328,12 +325,9 @@ func (y *YDB) Lock() error {
 
 			// If row exists at all, lock is present
 			locked := rows.Next()
-			if locked && !y.config.ForceLock {
+			if locked {
 				return database.ErrLocked
 			}
-			if locked && y.config.ForceLock {
-				return nil
-			}
 
 			setLockQuery := fmt.Sprintf("INSERT INTO %s (lock_id) VALUES ('%s')", y.config.LockTable, aid)
 			if _, err = tx.Exec(setLockQuery); err != nil {