From db0f6c0f461637f47310b87acb9e69d37beae930 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 4 Aug 2021 09:46:51 +0200 Subject: [PATCH 1/4] vr: restart conntrackd instead of '/usr/sbin/conntrackd -d' --- systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py index 190de1ab82e2..b6be826d2e50 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py @@ -280,7 +280,7 @@ def set_backup(self): dev = interface.get_device() cmd = "%s -C %s" % (self.CONNTRACKD_BIN, self.CONNTRACKD_CONF) - CsHelper.execute("%s -d" % cmd) + CsHelper.service("conntrackd", "restart") CsHelper.service("ipsec", "stop") CsHelper.service("xl2tpd", "stop") From 7c43bd13adca4a1314573883e4357a32c2354550 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 4 Aug 2021 16:32:27 +0200 Subject: [PATCH 2/4] vr: remove unused cmd --- systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 1 - 1 file changed, 1 deletion(-) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py index b6be826d2e50..00aa2a023fa2 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py @@ -242,7 +242,6 @@ def set_fault(self): for interface in interfaces: CsHelper.execute("ifconfig %s down" % interface.get_device()) - cmd = "%s -C %s" % (self.CONNTRACKD_BIN, self.CONNTRACKD_CONF) CsHelper.execute("%s -s" % cmd) CsHelper.service("ipsec", "stop") CsHelper.service("xl2tpd", "stop") From 764ee299ffbb3af5c6620cb09d388128d83aaae9 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 5 Aug 2021 20:10:11 +0200 Subject: [PATCH 3/4] Revert "vr: remove unused cmd" This reverts commit b97cf469952fe0706d91af411eaffa62a06761a6. --- systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 1 + 1 file changed, 1 insertion(+) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py index 00aa2a023fa2..b6be826d2e50 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py @@ -242,6 +242,7 @@ def set_fault(self): for interface in interfaces: CsHelper.execute("ifconfig %s down" % interface.get_device()) + cmd = "%s -C %s" % (self.CONNTRACKD_BIN, self.CONNTRACKD_CONF) CsHelper.execute("%s -s" % cmd) CsHelper.service("ipsec", "stop") CsHelper.service("xl2tpd", "stop") From 5150c8691685422a1240320729ac0c79af0ddc65 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 4 Aug 2021 13:30:30 +0200 Subject: [PATCH 4/4] vr: remove unused cmd --- systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 1 - 1 file changed, 1 deletion(-) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py index b6be826d2e50..23727701060c 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py @@ -279,7 +279,6 @@ def set_backup(self): CsHelper.execute(cmd2) dev = interface.get_device() - cmd = "%s -C %s" % (self.CONNTRACKD_BIN, self.CONNTRACKD_CONF) CsHelper.service("conntrackd", "restart") CsHelper.service("ipsec", "stop") CsHelper.service("xl2tpd", "stop")