summaryrefslogtreecommitdiff
path: root/sql/nt_servc.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2008-11-14 02:01:41 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2008-11-14 02:01:41 +0100
commitea0efe4526397b6fbc3a5795f8c35b6d4e943baa (patch)
treedc2b286e5971664d1cad910fc946e7e50a7381b0 /sql/nt_servc.cc
parentd60da1c2a741dc06e1061573afb078384433c9f8 (diff)
downloadmariadb-git-ea0efe4526397b6fbc3a5795f8c35b6d4e943baa.tar.gz
Bug #20430 mysqld.exe windows service stuck in "SERVICE_STOP_PENDING"
status The problem appears to be a race condition, when service is being stopped right after startup. We set the service status to SERVICE_RUNNING way too early it cannot yet handle stop requests - initialization has not finished and hEventShutdown that signals server to stop is not yet created. If somebody issues "net stop MySQL" at this time, MySQL is not informed about the stop and continues to run as usual, while NTService::ServiceMain() stucks forever waiting for mysql's "main" thread to finish. Solution is to remain in SERVICE_START_PENDING status until after server initialization is fully complete and only then change the status to SERVICE_RUNNING. In SERVICE_START_PENDING we do not accept service control requests, i.e it is not possible to stop service in that time.
Diffstat (limited to 'sql/nt_servc.cc')
-rw-r--r--sql/nt_servc.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc
index a04f284a3de..e570898f373 100644
--- a/sql/nt_servc.cc
+++ b/sql/nt_servc.cc
@@ -245,10 +245,6 @@ void NTService::ServiceMain(DWORD argc, LPTSTR *argv)
if (!pService->StartService())
goto error;
- // Check that the service is now running.
- if (!pService->SetStatus(SERVICE_RUNNING,NO_ERROR, 0, 0, 0))
- goto error;
-
// wait for exit event
WaitForSingleObject (pService->hExitEvent, INFINITE);
@@ -264,6 +260,14 @@ error:
return;
}
+
+void NTService::SetRunning()
+{
+ if (pService)
+ pService->SetStatus(SERVICE_RUNNING,NO_ERROR, 0, 0, 0);
+}
+
+
/* ------------------------------------------------------------------------
StartService() - starts the appliaction thread
-------------------------------------------------------------------------- */