41 lines
1009 B
Diff
41 lines
1009 B
Diff
|
From 444bdc44fc47c65f848efc0c39c1e8e6620ce10d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||
|
|
Date: Fri, 11 Oct 2019 12:12:52 +0200
|
||
|
|
Subject: [PATCH] Route: only validate for start and validate-all actions
|
||
|
|
|
||
|
|
---
|
||
|
|
heartbeat/Route | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/heartbeat/Route b/heartbeat/Route
|
||
|
|
index 9f92eff3a..8898e1afd 100755
|
||
|
|
--- a/heartbeat/Route
|
||
|
|
+++ b/heartbeat/Route
|
||
|
|
@@ -187,6 +187,8 @@ END
|
||
|
|
}
|
||
|
|
|
||
|
|
route_start() {
|
||
|
|
+ route_validate || exit $?
|
||
|
|
+
|
||
|
|
route_status
|
||
|
|
status=$?
|
||
|
|
if [ $status -eq $OCF_SUCCESS ]; then
|
||
|
|
@@ -313,8 +315,6 @@ for binary in ip grep; do
|
||
|
|
check_binary $binary
|
||
|
|
done
|
||
|
|
|
||
|
|
-route_validate || exit $?
|
||
|
|
-
|
||
|
|
case $OCF_RESKEY_family in
|
||
|
|
ip4) addr_family="-4" ;;
|
||
|
|
ip6) addr_family="-6" ;;
|
||
|
|
@@ -334,7 +334,7 @@ status|monitor) route_status;;
|
||
|
|
reload) ocf_log info "Reloading..."
|
||
|
|
route_start
|
||
|
|
;;
|
||
|
|
-validate-all) ;;
|
||
|
|
+validate-all) route_validate;;
|
||
|
|
*) route_usage
|
||
|
|
exit $OCF_ERR_UNIMPLEMENTED
|
||
|
|
;;
|