Merge pull request #350 from cashapp/prudhvi.mdl_lock_name_fix

Use tablename for metadatalock name as tablename respsects both the m…

pkg/migration/runner.go

@@ -202,7 +202,7 @@ func (r *Runner) Run(originalCtx context.Context) error {
 	}
 
 	// Take a metadata lock to prevent other migrations from running concurrently.
-	r.metadataLock, err = dbconn.NewMetadataLock(ctx, r.dsn(), r.table.QuotedName, r.logger)
+	r.metadataLock, err = dbconn.NewMetadataLock(ctx, r.dsn(), r.table.TableName, r.logger)
 	if err != nil {
 		return err
 	}

pkg/migration/runner_test.go

@@ -333,7 +333,7 @@ func TestTableLength(t *testing.T) {
 	assert.NoError(t, err)
 	err = m.Run(context.Background())
 	assert.Error(t, err)
-	assert.ErrorContains(t, err, "is too long")
+	assert.ErrorContains(t, err, "table name must be less than 54 characters")
 	assert.NoError(t, m.Close())
 
 	// There is another condition where the error will be in dropping the _old table first
@@ -350,7 +350,7 @@ func TestTableLength(t *testing.T) {
 	assert.NoError(t, err)
 	err = m.Run(context.Background())
 	assert.Error(t, err)
-	assert.ErrorContains(t, err, "is too long")
+	assert.ErrorContains(t, err, "table name must be less than 54 characters")
 	assert.NoError(t, m.Close())
 }
 
@@ -2763,6 +2763,12 @@ func TestResumeFromCheckpointE2EWithManualSentinel(t *testing.T) {
 			continue // table does not exist yet
 		}
 		if rowCount > 0 {
+			// Test that it's not possible to acquire metadata lock with name
+			// as tablename while the migration is running.
+			lock, err := dbconn.NewMetadataLock(ctx, testutils.DSN(),
+				tableName, &testLogger{})
+			assert.ErrorContains(t, err, "could not acquire metadata lock: resume_checkpoint_e2e_w_sentinel, lock is held by another connection")
+			assert.Nil(t, lock)
 			break
 		}
 	}