MB-65355 Add --eventing-add and --eventing-remove to rebalance

Eventing flags were previously missing from the rebalance subcommand.

Change-Id: I42d38fc36fbfd2f6c7ec069e57a30d8c0501ee71
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/226034
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Matt Hall <matt.hall@couchbase.com>

Author: lubomarinski

cbmgr.py

@@ -2170,6 +2170,10 @@ def __init__(self):
                            help="A list of servers which should have the Analytics Service added")
         group.add_argument("--analytics-remove", dest="cbas_remove", metavar="<server_list>",
                            help="A list of servers which should have the Analytics Service removed")
+        group.add_argument("--eventing-add", dest="eventing_add", metavar="<server_list>",
+                           help="A list of servers which should have the Eventing Service added")
+        group.add_argument("--eventing-remove", dest="eventing_remove", metavar="<server_list>",
+                           help="A list of servers which should have the Eventing Service removed")
         group.add_argument("--no-progress-bar", dest="no_bar", action="store_true",
                            default=False, help="Disables the progress bar")
         group.add_argument("--no-wait", dest="wait", action="store_false",
@@ -2184,7 +2188,8 @@ def execute(self, opts):
             opts.index_add or opts.index_remove or \
             opts.n1ql_add or opts.n1ql_remove or \
             opts.backup_add or opts.backup_remove or \
-            opts.cbas_add or opts.cbas_remove
+            opts.cbas_add or opts.cbas_remove or \
+            opts.eventing_add or opts.eventing_remove
 
         if opts.update_services and not services_modified:
             _exit_if_errors(["--update-services requires services to be added/removed from nodes"])
@@ -2231,11 +2236,18 @@ def execute(self, opts):
             if opts.cbas_remove is not None:
                 cbas_remove = apply_default_port(opts.cbas_remove)
 
+            eventing_add, eventing_remove = [], []
+            if opts.eventing_add is not None:
+                eventing_add = apply_default_port(opts.eventing_add)
+            if opts.eventing_remove is not None:
+                eventing_remove = apply_default_port(opts.eventing_remove)
+
             _, errors = self.rest.rebalance_services(fts_add, fts_remove,
                                                      index_add, index_remove,
                                                      n1ql_add, n1ql_remove,
                                                      backup_add, backup_remove,
-                                                     cbas_add, cbas_remove)
+                                                     cbas_add, cbas_remove,
+                                                     eventing_add, eventing_remove)
             _exit_if_errors(errors)
 
         time.sleep(1)

cluster_manager.py

@@ -722,7 +722,8 @@ def rebalance_services(self,
                            index_add, index_remove,
                            n1ql_add, n1ql_remove,
                            backup_add, backup_remove,
-                           cbas_add, cbas_remove):
+                           cbas_add, cbas_remove,
+                           eventing_add, eventing_remove):
 
         all_cluster_nodes_info, errors = self._get_all_cluster_nodes_info()
         if errors:
@@ -744,6 +745,9 @@ def rebalance_services(self,
         if len(set(cbas_add) & set(cbas_remove)) > 0:
             return None, ["Nodes can't be added and removed from the Analytics Service at the same time"]
 
+        if len(set(eventing_add) & set(eventing_remove)) > 0:
+            return None, ["Nodes can't be added and removed from the Eventing Service at the same time"]
+
         # Verify the nodes in the inputted lists exist in the cluster, and get their OTP names
         otp_fts_add, errors = self.get_otp_names_and_verify(all_cluster_nodes_info, fts_add, "fts_add")
         if errors:
@@ -786,6 +790,15 @@ def rebalance_services(self,
         if errors:
             return None, errors
 
+        otp_eventing_add, errors = self.get_otp_names_and_verify(all_cluster_nodes_info, eventing_add, "eventing_add")
+        if errors:
+            return None, errors
+
+        otp_eventing_remove, errors = self.get_otp_names_and_verify(
+            all_cluster_nodes_info, eventing_remove, "eventing_remove")
+        if errors:
+            return None, errors
+
         # Map the services to the nodes that provide them
         services_to_nodes = self.map_services_to_nodes(all_cluster_nodes_info)
 
@@ -815,6 +828,11 @@ def rebalance_services(self,
         if errors:
             return None, errors
 
+        self.add_service_to_node(otp_eventing_add, services_to_nodes[EVENT_SERVICE], EVENT_SERVICE)
+        errors = self.remove_service_from_node(otp_eventing_remove, services_to_nodes[EVENT_SERVICE], EVENT_SERVICE)
+        if errors:
+            return None, errors
+
         all_nodes, errors = self._get_all_nodes_otp_names(all_cluster_nodes_info)
         if errors:
             return None, errors
@@ -825,7 +843,8 @@ def rebalance_services(self,
                   f"topology[{INDEX_SERVICE}]": ','.join(services_to_nodes[INDEX_SERVICE]),
                   f"topology[{N1QL_SERVICE}]": ','.join(services_to_nodes[N1QL_SERVICE]),
                   f"topology[{BACKUP_SERVICE}]": ','.join(services_to_nodes[BACKUP_SERVICE]),
-                  f"topology[{CBAS_SERVICE}]": ','.join(services_to_nodes[CBAS_SERVICE])}
+                  f"topology[{CBAS_SERVICE}]": ','.join(services_to_nodes[CBAS_SERVICE]),
+                  f"topology[{EVENT_SERVICE}]": ','.join(services_to_nodes[EVENT_SERVICE])}
 
         return self._post_form_encoded(url, params)
 

docs/modules/cli/pages/cbcli/couchbase-cli-rebalance.adoc

@@ -19,7 +19,8 @@ _couchbase-cli rebalance_ [--cluster <url>] [--username <user>] [--password <pas
     [--index-add <servers>] [--index-remove <servers>] [--query-add <servers>]
     [--query-remove <servers>] [--backup-add <servers>]
     [--backup-remove <servers>] [--analytics-add <servers>]
-    [--analytics-remove <servers>] [--no-progress-bar] [--no-wait]
+    [--analytics-remove <servers>] [--eventing-add <servers>]
+    [--eventing-remove <servers>] [--no-progress-bar] [--no-wait]
 
 == DESCRIPTION
 
@@ -82,6 +83,12 @@ include::{partialsdir}/cbcli/part-common-options.adoc[]
 --analytics-remove <servers>::
   A comma separated list of nodes to remove the Analytics Service from.
 
+--eventing-add <servers>::
+  A comma separated list of nodes to add the Eventing Service to.
+
+--eventing-remove <servers>::
+  A comma separated list of nodes to remove the Eventing Service from.
+
 --no-progress-bar::
   Hides the progress bar which tracks the progress of the
   rebalance. This command will still wait for rebalance completion even if

test/test_cli.py

@@ -1202,7 +1202,7 @@ def setUp(self):
              'services': ['kv', 'n1ql', 'index', 'fts']},
             {'otpNode': 'ns1@some-host', 'hostname': 'some-host:6789', 'status': 'healthy', 'ports':
              {'httpsMgmt': '16789'}, 'clusterMembership': 'active',
-             'services': ['fts', 'index', 'n1ql', 'backup', 'cbas']},
+             'services': ['fts', 'index', 'n1ql', 'backup', 'cbas', 'eventing']},
             {'otpNode': 'ns1@some-host2', 'hostname': 'some-host2:6789', 'status': 'healthy', 'ports':
              {'httpsMgmt': '16789'}, 'clusterMembership': 'active',
                 'services': ['eventing', 'backup', 'cbas']}
@@ -1226,16 +1226,17 @@ def test_rebalance_no_args(self):
     def test_rebalance_services(self):
         cmd_args = ['--update-services', '--fts-add', 'some-host2:6789', '--index-add', 'some-host2:6789',
                     '--query-add', 'some-host2:6789', '--backup-add', 'localhost:6789', '--analytics-add',
-                    'localhost:6789', '--fts-remove', 'localhost:6789,some-host:6789',
-                    '--index-remove', 'localhost:6789,some-host:6789', '--query-remove',
-                    'localhost:6789,some-host:6789', '--backup-remove', 'some-host:6789,some-host2:6789',
-                    '--analytics-remove', 'some-host:6789,some-host2:6789']
+                    'localhost:6789', '--eventing-add', 'localhost:6789', '--fts-remove',
+                    'localhost:6789,some-host:6789', '--index-remove', 'localhost:6789,some-host:6789',
+                    '--query-remove', 'localhost:6789,some-host:6789', '--backup-remove',
+                    'some-host:6789,some-host2:6789', '--analytics-remove', 'some-host:6789,some-host2:6789',
+                    '--eventing-remove', 'some-host:6789,some-host2:6789']
 
         self.no_error_run(self.command + cmd_args, self.server_args)
         expected_params = ['knownNodes=ns1%40localhost%2Cns1%40some-host%2Cns1%40some-host2',
                            'topology%5Bfts%5D=ns1%40some-host2', 'topology%5Bindex%5D=ns1%40some-host2',
                            'topology%5Bn1ql%5D=ns1%40some-host2', 'topology%5Bbackup%5D=ns1%40localhost',
-                           'topology%5Bcbas%5D=ns1%40localhost']
+                           'topology%5Bcbas%5D=ns1%40localhost', 'topology%5Beventing%5D=ns1%40localhost']
         self.rest_parameter_match(expected_params)