From 2df73a6aa071a3272e05fd26fda4f8ba4e16cc6a Mon Sep 17 00:00:00 2001 From: Brian Hendriks Date: Wed, 15 May 2024 11:50:58 -0700 Subject: [PATCH] extra debug info --- go/cmd/dolt/commands/sqlserver/server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/go/cmd/dolt/commands/sqlserver/server.go b/go/cmd/dolt/commands/sqlserver/server.go index 32c38feee0..981b022a9f 100644 --- a/go/cmd/dolt/commands/sqlserver/server.go +++ b/go/cmd/dolt/commands/sqlserver/server.go @@ -71,6 +71,7 @@ const sqlServerHeartbeatIntervalEnvVar = "DOLT_SQL_SERVER_HEARTBEAT_INTERVAL" var ExternalDisableUsers bool = false var ErrCouldNotLockDatabase = goerrors.NewKind("database \"%s\" is locked by another dolt process; either clone the database to run a second server, or stop the dolt process which currently holds an exclusive write lock on the database") +var ErrCouldNotLockDatabaseWithDir = goerrors.NewKind("datadir: \"%s\", database \"%s\" is locked by another dolt process; either clone the database to run a second server, or stop the dolt process which currently holds an exclusive write lock on the database") // Serve starts a MySQL-compatible server. Returns any errors that were encountered. func Serve( @@ -180,7 +181,7 @@ func ConfigureServices( InitF: func(ctx context.Context) (err error) { return mrEnv.Iter(func(name string, dEnv *env.DoltEnv) (stop bool, err error) { if dEnv.IsAccessModeReadOnly() { - return true, ErrCouldNotLockDatabase.New(name) + return true, ErrCouldNotLockDatabaseWithDir.New(name, serverConfig.DataDir()) } return false, nil })