diff options
| -rwxr-xr-x | ctdb/config/functions | 10 | ||||
| -rwxr-xr-x | ctdb/tests/eventscripts/60.nfs.multi.002.sh | 10 | ||||
| -rwxr-xr-x | ctdb/tests/eventscripts/60.nfs.multi.003.sh | 5 | ||||
| -rwxr-xr-x | ctdb/tests/eventscripts/60.nfs.multi.004.sh | 5 | ||||
| -rwxr-xr-x | ctdb/tests/eventscripts/60.nfs.multi.005.sh | 5 |
5 files changed, 11 insertions, 24 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions index aa31f89103..4430d866bf 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -1195,16 +1195,6 @@ ctdb_service_check_reconfigure () ctdb_service_reconfigure fi ;; - monitor) - if ctdb_service_needs_reconfigure ; then - ctdb_service_reconfigure - # Given that the reconfigure might not have - # resulted in the service being stable yet, we - # replay the previous status since that's the best - # information we have. - ctdb_replay_monitor_status - fi - ;; esac else # Somebody else is running an event we don't want to collide diff --git a/ctdb/tests/eventscripts/60.nfs.multi.002.sh b/ctdb/tests/eventscripts/60.nfs.multi.002.sh index 350c1bc726..29386c13b2 100755 --- a/ctdb/tests/eventscripts/60.nfs.multi.002.sh +++ b/ctdb/tests/eventscripts/60.nfs.multi.002.sh @@ -2,7 +2,7 @@ . "${TEST_SCRIPTS_DIR}/unit.sh" -define_test "takeip, monitor -> reconfigure" +define_test "takeip, monitor -> no reconfigure" setup_nfs @@ -12,12 +12,6 @@ ok_null simple_test_event "takeip" $public_address -# This currently assumes that ctdb scriptstatus will always return a -# good status (when replaying). That should change and we will need -# to split this into 2 tests. -ok <<EOF -Reconfiguring service "nfs"... -Replaying previous status for this script due to reconfigure... -EOF +ok_null simple_test_event "monitor" diff --git a/ctdb/tests/eventscripts/60.nfs.multi.003.sh b/ctdb/tests/eventscripts/60.nfs.multi.003.sh index 68f45ab15d..653dece07a 100755 --- a/ctdb/tests/eventscripts/60.nfs.multi.003.sh +++ b/ctdb/tests/eventscripts/60.nfs.multi.003.sh @@ -2,7 +2,7 @@ . "${TEST_SCRIPTS_DIR}/unit.sh" -define_test "takeip, monitor -> reconfigure, replay error" +define_test "takeip, take reconfigure lock, monitor -> replay error" setup_nfs @@ -16,8 +16,9 @@ simple_test_event "takeip" $public_address ctdb_fake_scriptstatus 1 "ERROR" "$err" +eventscript_call ctdb_reconfigure_try_lock + required_result 1 <<EOF -Reconfiguring service "nfs"... Replaying previous status for this script due to reconfigure... $err EOF diff --git a/ctdb/tests/eventscripts/60.nfs.multi.004.sh b/ctdb/tests/eventscripts/60.nfs.multi.004.sh index b071ec8bd9..43323cf61f 100755 --- a/ctdb/tests/eventscripts/60.nfs.multi.004.sh +++ b/ctdb/tests/eventscripts/60.nfs.multi.004.sh @@ -2,7 +2,7 @@ . "${TEST_SCRIPTS_DIR}/unit.sh" -define_test "takeip, monitor -> reconfigure, replay timedout" +define_test "takeip, take reconfigure lock, monitor -> reconfigure, replay timedout" setup_nfs @@ -16,8 +16,9 @@ simple_test_event "takeip" $public_address ctdb_fake_scriptstatus -62 "TIMEDOUT" "$err" +eventscript_call ctdb_reconfigure_try_lock + required_result 1 <<EOF -Reconfiguring service "nfs"... Replaying previous status for this script due to reconfigure... [Replay of TIMEDOUT scriptstatus - note incorrect return code.] $err EOF diff --git a/ctdb/tests/eventscripts/60.nfs.multi.005.sh b/ctdb/tests/eventscripts/60.nfs.multi.005.sh index 82802aa01e..9816bec838 100755 --- a/ctdb/tests/eventscripts/60.nfs.multi.005.sh +++ b/ctdb/tests/eventscripts/60.nfs.multi.005.sh @@ -2,7 +2,7 @@ . "${TEST_SCRIPTS_DIR}/unit.sh" -define_test "takeip, monitor -> reconfigure, replay disabled" +define_test "takeip, take reconfigure lock, monitor -> reconfigure, replay disabled" setup_nfs @@ -16,8 +16,9 @@ simple_test_event "takeip" $public_address ctdb_fake_scriptstatus -8 "DISABLED" "$err" +eventscript_call ctdb_reconfigure_try_lock + ok <<EOF -Reconfiguring service "nfs"... Replaying previous status for this script due to reconfigure... [Replay of DISABLED scriptstatus - note incorrect return code.] $err EOF |