[SCM] Samba Shared Repository - branch master updated
Amitay Isaacs
amitay at samba.org
Sun Jul 23 17:32:02 UTC 2017
The branch, master has been updated
via 312947f ctdb-tests: Add event script startup/shutdown tests
via 507c81a ctdb-scripts: Fix a typo
from f1e4ae9 s4-drepl: Block GetNCChanges during a DsReplicaSync
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 312947f89bf9d645ab8ee52e0c7c6ccd48354d85
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Jul 19 06:09:15 2017 +1000
ctdb-tests: Add event script startup/shutdown tests
For vsftpd, httpd, winbind. These should help to catch typo
regressions.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
Autobuild-Date(master): Sun Jul 23 19:31:08 CEST 2017 on sn-devel-144
commit 507c81a73985321b253c699357211e6324f3a104
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Jul 17 15:36:42 2017 +1000
ctdb-scripts: Fix a typo
This is a regression introduced in commit
e847ec3ae24cc6c8c69284c7fe0791a319cf7142
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events.d/41.httpd | 2 +-
...pd.monitor.001.sh => 40.vsftpd.shutdown.001.sh} | 3 +-
ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh | 13 +++++++++
...tpd.monitor.001.sh => 40.vsftpd.startup.001.sh} | 3 +-
ctdb/tests/eventscripts/40.vsftpd.startup.002.sh | 13 +++++++++
...tpd.monitor.001.sh => 41.httpd.shutdown.001.sh} | 3 +-
ctdb/tests/eventscripts/41.httpd.shutdown.002.sh | 13 +++++++++
...ttpd.monitor.001.sh => 41.httpd.startup.001.sh} | 3 +-
ctdb/tests/eventscripts/41.httpd.startup.002.sh | 13 +++++++++
...d.monitor.001.sh => 49.winbind.shutdown.001.sh} | 3 +-
ctdb/tests/eventscripts/49.winbind.shutdown.002.sh | 13 +++++++++
...nd.monitor.001.sh => 49.winbind.startup.001.sh} | 3 +-
ctdb/tests/eventscripts/49.winbind.startup.002.sh | 13 +++++++++
ctdb/tests/eventscripts/scripts/local.sh | 32 ++++++++++++----------
14 files changed, 102 insertions(+), 28 deletions(-)
copy ctdb/tests/eventscripts/{40.vsftpd.monitor.001.sh => 40.vsftpd.shutdown.001.sh} (68%)
create mode 100755 ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
copy ctdb/tests/eventscripts/{40.vsftpd.monitor.001.sh => 40.vsftpd.startup.001.sh} (68%)
create mode 100755 ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
copy ctdb/tests/eventscripts/{41.httpd.monitor.001.sh => 41.httpd.shutdown.001.sh} (68%)
create mode 100755 ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
copy ctdb/tests/eventscripts/{41.httpd.monitor.001.sh => 41.httpd.startup.001.sh} (68%)
create mode 100755 ctdb/tests/eventscripts/41.httpd.startup.002.sh
copy ctdb/tests/eventscripts/{49.winbind.monitor.001.sh => 49.winbind.shutdown.001.sh} (68%)
create mode 100755 ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
copy ctdb/tests/eventscripts/{49.winbind.monitor.001.sh => 49.winbind.startup.001.sh} (68%)
create mode 100755 ctdb/tests/eventscripts/49.winbind.startup.002.sh
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events.d/41.httpd
index b9aa7e1..3e45768 100755
--- a/ctdb/config/events.d/41.httpd
+++ b/ctdb/config/events.d/41.httpd
@@ -52,7 +52,7 @@ is_ctdb_managed_service || exit 0
case "$1" in
startup)
service_start
- ctdb_counter_int
+ ctdb_counter_init
;;
shutdown)
diff --git a/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh b/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
similarity index 68%
copy from ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
copy to ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
index fdad12a..e37b9e6 100755
--- a/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
@@ -2,10 +2,9 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "not managed, check no-op"
+define_test "not managed"
setup_vsftpd "down"
ok_null
-
simple_test
diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
new file mode 100755
index 0000000..21fe06e
--- /dev/null
+++ b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "managed"
+
+setup_vsftpd "up"
+export CTDB_MANAGES_VSFTPD="yes"
+
+ok <<EOF
+Stopping vsftpd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh b/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
similarity index 68%
copy from ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
copy to ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
index fdad12a..e37b9e6 100755
--- a/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
@@ -2,10 +2,9 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "not managed, check no-op"
+define_test "not managed"
setup_vsftpd "down"
ok_null
-
simple_test
diff --git a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh b/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
new file mode 100755
index 0000000..d1b560b
--- /dev/null
+++ b/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "managed"
+
+setup_vsftpd "down"
+export CTDB_MANAGES_VSFTPD="yes"
+
+ok <<EOF
+Starting vsftpd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh b/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
similarity index 68%
copy from ctdb/tests/eventscripts/41.httpd.monitor.001.sh
copy to ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
index f400eaa..92bd27e 100755
--- a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
@@ -2,10 +2,9 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "not managed, check no-op"
+define_test "not managed"
setup_httpd "down"
ok_null
-
simple_test
diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
new file mode 100755
index 0000000..e57fb8e
--- /dev/null
+++ b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "managed"
+
+setup_httpd "up"
+export CTDB_MANAGES_HTTPD="yes"
+
+ok <<EOF
+Stopping httpd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh b/ctdb/tests/eventscripts/41.httpd.startup.001.sh
similarity index 68%
copy from ctdb/tests/eventscripts/41.httpd.monitor.001.sh
copy to ctdb/tests/eventscripts/41.httpd.startup.001.sh
index f400eaa..92bd27e 100755
--- a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/41.httpd.startup.001.sh
@@ -2,10 +2,9 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "not managed, check no-op"
+define_test "not managed"
setup_httpd "down"
ok_null
-
simple_test
diff --git a/ctdb/tests/eventscripts/41.httpd.startup.002.sh b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
new file mode 100755
index 0000000..494f1cb
--- /dev/null
+++ b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "managed"
+
+setup_httpd "down"
+export CTDB_MANAGES_HTTPD="yes"
+
+ok <<EOF
+Starting httpd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh b/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
similarity index 68%
copy from ctdb/tests/eventscripts/49.winbind.monitor.001.sh
copy to ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
index 94253d8..f8b9eb6 100755
--- a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh
+++ b/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
@@ -2,10 +2,9 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "not managed, check no-op"
+define_test "not managed"
setup_winbind "down"
ok_null
-
simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
new file mode 100755
index 0000000..6dee450
--- /dev/null
+++ b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "managed"
+
+setup_winbind "up"
+export CTDB_MANAGES_WINBIND="yes"
+
+ok <<EOF
+Stopping winbind: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh b/ctdb/tests/eventscripts/49.winbind.startup.001.sh
similarity index 68%
copy from ctdb/tests/eventscripts/49.winbind.monitor.001.sh
copy to ctdb/tests/eventscripts/49.winbind.startup.001.sh
index 94253d8..f8b9eb6 100755
--- a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh
+++ b/ctdb/tests/eventscripts/49.winbind.startup.001.sh
@@ -2,10 +2,9 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "not managed, check no-op"
+define_test "not managed"
setup_winbind "down"
ok_null
-
simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.startup.002.sh b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
new file mode 100755
index 0000000..6653f55
--- /dev/null
+++ b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "managed"
+
+setup_winbind "down"
+export CTDB_MANAGES_WINBIND="yes"
+
+ok <<EOF
+Starting winbind: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 0e16f5b..1d51232 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -1205,18 +1205,18 @@ setup_reclock ()
setup_vsftpd ()
{
- service_name="vsftpd"
+ debug "Setting up VSFTPD environment: service $1, not managed by CTDB"
- if [ "$1" != "down" ] ; then
- die "setup_vsftpd up not implemented!!!"
- else
- debug "Setting up VSFTPD environment: service down, not managed by CTDB"
+ _service_name="vsftpd"
- service vsftpd force-stopped
+ if [ "$1" != "down" ] ; then
+ service "$_service_name" start
+ else
+ service "$_service_name" force-stopped
+ fi
export CTDB_MANAGED_SERVICES="foo"
unset CTDB_MANAGES_VSFTPD
- fi
}
######################################################################
@@ -1225,18 +1225,20 @@ setup_vsftpd ()
setup_httpd ()
{
- if [ "$1" != "down" ] ; then
- die "setup_httpd up not implemented!!!"
- else
- debug "Setting up HTTPD environment: service down, not managed by CTDB"
+ debug "Setting up HTTPD environment: service $1, not managed by CTDB"
- for service_name in "apache2" "httpd" ; do
- service "$service_name" force-stopped
- done
+ if [ "$1" != "down" ] ; then
+ for _service_name in "apache2" "httpd" ; do
+ service "$_service_name" start
+ done
+ else
+ for _service_name in "apache2" "httpd" ; do
+ service "$_service_name" force-stopped
+ done
+ fi
export CTDB_MANAGED_SERVICES="foo"
unset CTDB_MANAGES_HTTPD
- fi
}
######################################################################
--
Samba Shared Repository
More information about the samba-cvs
mailing list