@@ -39,7 +39,7 @@ def pause_scylla_with_sigstop(target_node: BaseNode):
39
39
40
40
41
41
@contextlib .contextmanager
42
- def block_loaders_payload_from_scylla_node (scylla_node : BaseNode , loader_nodes : list [BaseNode ]):
42
+ def block_loaders_payload_for_scylla_node (scylla_node : BaseNode , loader_nodes : list [BaseNode ]):
43
43
ports = [9042 , 9142 , 19042 , 19142 ]
44
44
scylla_node .install_package ("iptables" )
45
45
scylla_node .start_service ("iptables" , ignore_status = True )
@@ -52,13 +52,14 @@ def block_loaders_payload_from_scylla_node(scylla_node: BaseNode, loader_nodes:
52
52
scylla_node .remoter .sudo (
53
53
f"ip6tables -A INPUT -s { ',' .join (blocking_ips )} -p tcp --dport { port } -j DROP" , ignore_status = True )
54
54
yield
55
- scylla_node .log .debug ("Remove all iptable rules %s" , scylla_node .name )
56
- for port in ports :
57
- scylla_node .remoter .sudo (
58
- f"iptables -D INPUT -s { ',' .join (blocking_ips )} -p tcp --dport { port } -j DROP" , ignore_status = True )
59
- scylla_node .remoter .sudo (
60
- f"ip6tables -D INPUT -s { ',' .join (blocking_ips )} -p tcp --dport { port } -j DROP" , ignore_status = True )
61
- scylla_node .stop_service ("iptables" , ignore_status = True )
55
+ # if scylla_node is alive, then delete the iptables rules
56
+ if scylla_node .remoter .is_up ():
57
+ for port in ports :
58
+ scylla_node .remoter .sudo (
59
+ f"iptables -D INPUT -s { ',' .join (blocking_ips )} -p tcp --dport { port } -j DROP" , ignore_status = True )
60
+ scylla_node .remoter .sudo (
61
+ f"ip6tables -D INPUT -s { ',' .join (blocking_ips )} -p tcp --dport { port } -j DROP" , ignore_status = True )
62
+ scylla_node .stop_service ("iptables" , ignore_status = True )
62
63
63
64
64
65
def is_node_removed_from_cluster (removed_node : BaseNode , verification_node : BaseNode ) -> bool :
0 commit comments