diff options
| author | David Teigland <teigland@redhat.com> | 2009-06-02 15:02:58 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2009-06-02 15:02:58 -0500 |
| commit | 92514e038d8f5b5c6cb07b832fffd6af8800f256 (patch) | |
| tree | ec7bc6d3d8bfe480a32208eac470992057e1ff8b | |
| parent | df2f314bdd152fa6622a7374b2ee2366e83655e7 (diff) | |
| download | dct-stuff-92514e038d8f5b5c6cb07b832fffd6af8800f256.tar.gz dct-stuff-92514e038d8f5b5c6cb07b832fffd6af8800f256.tar.xz dct-stuff-92514e038d8f5b5c6cb07b832fffd6af8800f256.zip | |
cpgx: also kill aisexec
with -d1 option
Signed-off-by: David Teigland <teigland@redhat.com>
| -rw-r--r-- | cpgx/Makefile | 10 | ||||
| -rw-r--r-- | cpgx/cpgx.c | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cpgx/Makefile b/cpgx/Makefile index ecca21a..e47bef7 100644 --- a/cpgx/Makefile +++ b/cpgx/Makefile @@ -38,8 +38,14 @@ endif tarfiles := cpgx.c list.h cpgx.spec Makefile VERSION tarball := cpgx-$(VERSION).tar.gz -# requires git tag of the release be made first, -# e.g. git tag -a cpgx-v1.0 -m "release 1.0" +# to release tarball: +# edit VERSION with new number and without -git +# commit VERSION change +# tag that VERSION commit, e.g. git tag -a cpgx-v1.0 -m "release 1.0" +# make tarball +# edit VERSION adding -git +# VERSION change +# push $(tarball): $(tarfiles) -$(RM) $@ diff --git a/cpgx/cpgx.c b/cpgx/cpgx.c index 6bdfa14..683a431 100644 --- a/cpgx/cpgx.c +++ b/cpgx/cpgx.c @@ -1592,8 +1592,9 @@ void loop(void) if (we_should_die()) { fflush(stdout); fflush(stderr); - log_debug("killall -9 corosync"); + log_debug("killall -9 corosync/aisexec"); system("killall -9 corosync"); + system("killall -9 aisexec"); /* others should see us fail before we rejoin */ sleep(10); log_debug("cman_tool join -w"); @@ -1613,7 +1614,7 @@ void print_usage(void) printf(" -e [0|1] exit included in test [off|on], default 1\n"); printf(" (program exits without leaving cpg then rejoins)\n"); printf(" -d [0|1] die included in test [off|on], default 0\n"); - printf(" (kills corosync, restarts with cman_tool join)\n"); + printf(" (kills corosync/aisexec, restarts with cman_tool join)\n"); printf(" -s <num> sync up to num events, default %d\n", DEFAULT_SYNC_MAX); printf(" -t <sec> timeout after no dispatch for this many seconds, default 0 (never)\n"); |