mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

daemon-windows: unlink pidfile before stopping the service.

Browse Source 
When a OVS daemon is configured to run as a Windows service,
when the service is stopped by calling service_stop(), the
windows services manager does not give enough time to do
everything in the atexit handler. So call the exit handler
directly from service_stop().

Also add a test case for Windows services which checks for
the termination of the service by looking at pidfile cleaned
by the exit handler.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com
Acked-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Gurucharan Shetty
2014-05-28 15:07:31 -07:00
parent 784acd821b
commit 02a514ef71
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/daemon-windows.c
View File

@@ -218,6 +218,11 @@ should_service_stop(void)
void void
service_stop() service_stop()
{ {
if (!service_started) {
return;
}
fatal_signal_atexit_handler();
ResetEvent(wevent); ResetEvent(wevent);
CloseHandle(wevent); CloseHandle(wevent);

7
lib/fatal-signal.c
View File

@@ -64,7 +64,6 @@ static volatile sig_atomic_t stored_sig_nr = SIG_ATOMIC_MAX;
static struct ovs_mutex mutex; static struct ovs_mutex mutex;
static void atexit_handler(void);
static void call_hooks(int sig_nr); static void call_hooks(int sig_nr);
#ifdef _WIN32 #ifdef _WIN32
static BOOL WINAPI ConsoleHandlerRoutine(DWORD dwCtrlType); static BOOL WINAPI ConsoleHandlerRoutine(DWORD dwCtrlType);
@@ -115,7 +114,7 @@ fatal_signal_init(void)
} }
#endif #endif
} }
atexit(atexit_handler); atexit(fatal_signal_atexit_handler);
} }
} }
@@ -226,8 +225,8 @@ fatal_ignore_sigpipe(void)
#endif #endif
} }
static void void
atexit_handler(void) fatal_signal_atexit_handler(void)
{ {
call_hooks(0); call_hooks(0);
} }

1
lib/fatal-signal.h
View File

@@ -31,6 +31,7 @@ void fatal_signal_fork(void);
void fatal_signal_run(void); void fatal_signal_run(void);
void fatal_signal_wait(void); void fatal_signal_wait(void);
void fatal_ignore_sigpipe(void); void fatal_ignore_sigpipe(void);
void fatal_signal_atexit_handler(void);
/* Convenience functions for unlinking files upon termination. /* Convenience functions for unlinking files upon termination.
* *

25
tests/daemon.at
View File

@@ -159,3 +159,28 @@ AT_CHECK([grep 'ovsdb-server: could not initialize control socket' stderr],
[0], [ignore], []) [0], [ignore], [])
AT_CHECK([test ! -s pid]) AT_CHECK([test ! -s pid])
AT_CLEANUP AT_CLEANUP
AT_SETUP([daemon --service])
AT_SKIP_IF([test "$IS_WIN32" != "yes"])
OVSDB_INIT([db])
AT_CAPTURE_FILE([pid])
# To create a Windows service, we need the absolute path for the executable.
abs_path="$(cd $(dirname `which ovsdb-server`); pwd -W; cd $OLDPWD)"
AT_CHECK([sc create ovsdb-server binpath="$abs_path/ovsdb-server `pwd`/db --log-file=`pwd`/ovsdb-server.log --pidfile=`pwd`/pid --remote=punix:`pwd`/socket --unixctl=`pwd`/unixctl --service"],
[0], [[[SC]] CreateService SUCCESS
])
AT_CHECK([sc start ovsdb-server], [0], [ignore])
OVS_WAIT_UNTIL([test -s pid])
AT_CHECK([sc query ovsdb-server | grep STATE | grep RUNNING], [0], [ignore])
AT_CHECK([kill -0 `cat pid`], [0], [ignore])
AT_CHECK([ovs-appctl -t `pwd`/unixctl ovsdb-server/list-dbs], [0],
[Open_vSwitch
])
AT_CHECK([sc stop ovsdb-server], [0], [ignore])
OVS_WAIT_UNTIL([test ! -s pid])
AT_CHECK([sc query ovsdb-server | grep STATE | grep STOPPED], [0], [ignore])
AT_CHECK([sc delete ovsdb-server], [0], [[[SC]] DeleteService SUCCESS
])
AT_CLEANUP