MB-65437 Consider columnar edition on version checks

Change-Id: I1c006af826d12373614527418b424c006fec351b
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/223857
Reviewed-by: Michael Blow <michael.blow@couchbase.com>
Reviewed-by: Matt Hall <matt.hall@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>

Author: mblow

cbmgr.py

@@ -205,13 +205,15 @@ def decorator(self, opts):
             if version_check:
                 check_versions(self.rest)
             if enterprise_check is not None:
-                enterprise, errors = self.rest.is_enterprise()
+                # check columnar when we check enterprise to avoid a duplicate fetch on pools
+                enterprise, columnar, errors = self.rest.is_enterprise_columnar()
                 _exit_if_errors(errors)
 
                 if enterprise_check and not enterprise:
                     _exit_if_errors(['Command only available in enterprise edition'])
 
                 self.enterprise = enterprise
+                self.columnar = columnar
 
             return fn(self, opts)
         return decorator
@@ -313,7 +315,7 @@ def index_storage_mode_to_param(value, default="plasma"):
     return value
 
 
-def process_services(services, enterprise, cluster_version="0.0.0"):
+def process_services(services, enterprise, columnar, cluster_version="0.0.0"):
     """Converts services to a format Couchbase understands"""
     sep = ","
     if services.find(sep) < 0:
@@ -333,7 +335,7 @@ def process_services(services, enterprise, cluster_version="0.0.0"):
         return None, ["Invalid service configuration. A manager only node cannot run any other services."]
 
     versionCheck = compare_versions(cluster_version, "7.6.0")
-    if manager_only in svc_set and versionCheck == -1:
+    if manager_only in svc_set and not columnar and versionCheck == -1:
         return None, ["The manager only service can only be used with >= 7.6.0 clusters"]
 
     if not enterprise:
@@ -905,7 +907,7 @@ def execute(self, opts):
         if "manager-only" in opts.services:
             _exit_if_errors(["Cannot initialize cluster with the manager only service"])
 
-        services, errors = process_services(opts.services, self.enterprise)
+        services, errors = process_services(opts.services, self.enterprise, self.columnar)
         _exit_if_errors(errors)
 
         if 'kv' not in services.split(','):
@@ -932,7 +934,7 @@ def execute(self, opts):
         _exit_if_errors(errors)
 
         versionCheck = compare_versions(min_version, "7.2.3")
-        if versionCheck == -1:
+        if not self.columnar and versionCheck == -1:
             _exit_if_errors(["--cluster-init can only be used against >= 7.2.3 clusters"])
 
         if not self.enterprise and opts.notifications == "0":
@@ -2437,7 +2439,7 @@ def execute(self, opts):
         min_version, error = self.rest.min_version()
         _exit_if_errors(error)
 
-        opts.services, errors = process_services(opts.services, self.enterprise, min_version)
+        opts.services, errors = process_services(opts.services, self.enterprise, self.columnar, min_version)
         _exit_if_errors(errors)
 
         settings, errors = self.rest.index_settings()
@@ -3929,7 +3931,7 @@ def execute(self, opts):
         _exit_if_errors(errors)
 
         versionCheck = compare_versions(min_version, "7.2.3")
-        if not self.enterprise and versionCheck != -1:
+        if not self.enterprise and not self.columnar and versionCheck != -1:
             _exit_if_errors(["Modifying notifications settings is an Enterprise Edition only feature"])
 
         enabled = None

cluster_manager.py

@@ -257,11 +257,12 @@ def is_cluster_initialized(self):
             return True, None
         return False, errors
 
-    def is_enterprise(self):
+    def is_enterprise_columnar(self):
         data, errors = self.pools()
         if errors:
-            return None, errors
-        return data["isEnterprise"], None
+            return None, None, errors
+        # use data["isColumnar"] once MB-65393 is completed
+        return data["isEnterprise"], data["implementationVersion"].endswith("-columnar"), None
 
     def get_hostnames_for_service(self, service_name):
         """ Gets all hostnames that run a service

test/test_cbmgr.py

@@ -30,12 +30,12 @@ def test_process_services(self):
         for name, test in tests.items():
             with self.subTest(name):
                 cluster_version = test.setdefault("cluster_version", "7.6.0")
-                services, err = process_services(test["service"], True, cluster_version)
+                services, err = process_services(test["service"], True, False, cluster_version)
                 self.assertEqual(err, test.setdefault("error", None))
                 self.assertEqual(services, test["expected"])
 
     def test_process_services_version_none(self):
-        services, err = process_services("manager-only", True)
+        services, err = process_services("manager-only", True, False)
         self.assertEqual(err, None)
         self.assertEqual(services, "")