kaqing 2.0.110__py3-none-any.whl → 2.0.184__py3-none-any.whl

adam/commands/repair/repair_run.py

@@ -1,12 +1,12 @@
 from adam.commands.command import Command
+from adam.commands.reaper.utils_reaper import Reapers
 from adam.utils_k8s.jobs import Jobs
 from adam.utils_k8s.volumes import Volumes
 from adam.repl_state import ReplState, RequiredState
 from adam.config import Config
-from adam.commands.reaper.reaper_session import ReaperSession
 from adam.commands.reaper.reaper_runs_abort import ReaperRunsAbort
 from adam.commands.reaper.reaper_schedule_stop import ReaperScheduleStop
-from adam.utils import log2
+from adam.utils import log2, log_exc
 
 class RepairRun(Command):
     COMMAND = 'repair run'
@@ -30,43 +30,36 @@ class RepairRun(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        replace = False
-        if len(args) == 1:
-            replace = args[0] == 'replace'
+        with self.validate(args, state) as (args, state):
+            replace = False
+            if len(args) == 1:
+                replace = args[0] == 'replace'
 
-        log2("Stopping all reaper schedules...")
-        reaper = ReaperSession.create(state)
-        schedules = reaper.schedule_ids(state)
-        for schedule_id in schedules:
-            ReaperScheduleStop().run(f'reaper stop schedule {schedule_id}', state)
-        log2("Aborting all reaper runs...")
-        state = ReaperRunsAbort().run('reaper abort runs', state)
+            with log_exc():
+                log2("Stopping all reaper schedules...")
+                for schedule_id in Reapers.cached_schedule_ids(state):
+                    ReaperScheduleStop().run(f'reaper stop schedule {schedule_id}', state)
+                log2("Aborting all reaper runs...")
+                state = ReaperRunsAbort().run('reaper abort runs', state)
 
-        image = Config().get('repair.image', 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.11')
-        secret = Config().get('repair.secret', 'ciregistryc3iotio')
-        log_path = Config().get('repair.log-path', '/home/cassrepair/logs/')
-        user, _ = state.user_pass()
-        ns = state.namespace
-        env = Config().get('repair.env', {})
-        env["cluster"] = ns
-        env_from = {"username": user, "password": user}
-        pvc_name ='cassrepair-log-' + state.sts
-        Volumes.create_pvc(pvc_name, 30, ns)
-        if replace:
-            Jobs.delete('cassrepair-'+state.sts, ns)
-        Jobs.create('cassrepair-'+state.sts, ns, image, secret, env, env_from, 'cassrepair', pvc_name, log_path)
+            image = Config().get('repair.image', 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.11')
+            secret = Config().get('repair.secret', 'ciregistryc3iotio')
+            log_path = Config().get('repair.log-path', '/home/cassrepair/logs/')
+            user, _ = state.user_pass()
+            ns = state.namespace
+            env = Config().get('repair.env', {})
+            env["cluster"] = ns
+            env_from = {"username": user, "password": user}
+            pvc_name ='cassrepair-log-' + state.sts
+            Volumes.create_pvc(pvc_name, 30, ns)
+            if replace:
+                Jobs.delete('cassrepair-'+state.sts, ns)
+            Jobs.create('cassrepair-'+state.sts, ns, image, secret, env, env_from, 'cassrepair', pvc_name, log_path)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{RepairRun.COMMAND} [replace]\t start a repair job, default not replacing'

adam/commands/repair/repair_scan.py

@@ -28,47 +28,41 @@ class RepairScan(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        n = "7"
-        if len(args) == 1:
-            n = str(args[0])
-        image = Config().get('repair.image', 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.11')
-        secret = Config().get('repair.secret', 'ciregistryc3iotio')
-        log_path = secret = Config().get('repair.log-path', '/home/cassrepair/logs/')
-        ns = state.namespace
-        pvc_name ='cassrepair-log-' + state.sts
-        pod_name = 'repair-scan'
-
-        try:
-            Pods.create(ns, pod_name, image, ["sh", "-c", "tail -f /dev/null"],
-                       secret=secret,
-                       env={},
-                       volume_name='cassrepair-log',
-                       pvc_name=pvc_name,
-                       mount_path='/home/cassrepair/logs/')
-        except Exception as e:
-            if e.status == 409:
-                log2(f"Pod {pod_name} already exists")
-            else:
-                log2("Exception when calling BatchV1Apii->create_namespaced_job: %s\n" % e)
-
-        Pods.wait_for_running(ns, pod_name, 'Waiting for the scanner pod to start up...')
+        with self.validate(args, state) as (args, state):
+            n = "7"
+            if len(args) == 1:
+                n = str(args[0])
+            image = Config().get('repair.image', 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.11')
+            secret = Config().get('repair.secret', 'ciregistryc3iotio')
+            log_path = secret = Config().get('repair.log-path', '/home/cassrepair/logs/')
+            ns = state.namespace
+            pvc_name ='cassrepair-log-' + state.sts
+            pod_name = 'repair-scan'
+
+            try:
+                Pods.create(ns, pod_name, image, ["sh", "-c", "tail -f /dev/null"],
+                        secret=secret,
+                        env={},
+                        volume_name='cassrepair-log',
+                        pvc_name=pvc_name,
+                        mount_path='/home/cassrepair/logs/')
+            except Exception as e:
+                if e.status == 409:
+                    log2(f"Pod {pod_name} already exists")
+                else:
+                    log2("Exception when calling BatchV1Apii->create_namespaced_job: %s\n" % e)
+
+            Pods.wait_for_running(ns, pod_name, 'Waiting for the scanner pod to start up...')
+
+            try:
+                Pods.exec(pod_name, pod_name, ns, f"find {log_path} -type f -mtime -{n} -print0 | xargs -0 grep failed")
+            finally:
+                Pods.delete(pod_name, ns)
 
-        try:
-            Pods.exec(pod_name, pod_name, ns, f"find {log_path} -type f -mtime -{n} -print0 | xargs -0 grep failed")
-        finally:
-            Pods.delete(pod_name, ns)
-
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{RepairScan.COMMAND} [n]\t scan last n days repair log, default 7 days'

adam/commands/repair/repair_stop.py

@@ -25,20 +25,14 @@ class RepairStop(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        ns = state.namespace
-        Jobs.delete('cassrepair-'+state.sts, ns)
+        with self.validate(args, state) as (args, state):
+            ns = state.namespace
+            Jobs.delete('cassrepair-'+state.sts, ns)
 
-        return state
+            return state
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{RepairStop.COMMAND}\t delete a repair job'

adam/commands/report.py

@@ -29,35 +29,33 @@ class Report(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        output: dict[str, any] = {}
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if state.in_repl:
-            args, show = Command.extract_options(args, ['-s', '--show'])
-
-            args, redirect = Command.extract_options(args, ['>'])
-            if not redirect or not args:
-                log2('Please specify file name: e.g. report > /tmp/report.log')
-                return 'no-report-destination'
-
-            results = run_checks(state.sts, state.namespace, state.pod, show_output=show)
-            output = CheckResult.report(results)
-            with open(args[0], "w") as json_file:
-                json.dump(output, json_file, indent=2)
-                log2(f'Report stored in {args[0]}.')
-        else:
-            args, show = Command.extract_options(args, ['-s', '--show'])
-
-            results = run_checks(state.sts, state.namespace, state.pod, show_output=show)
-            output = CheckResult.report(results)
-            click.echo(json.dumps(output, indent=2))
-
-        return output
-
-    def completion(self, _: ReplState):
-        return {Report.COMMAND: {">": None}}
+        with self.validate(args, state) as (args, state):
+            output: dict[str, any] = {}
+
+            if state.in_repl:
+                args, show = Command.extract_options(args, ['-s', '--show'])
+
+                args, redirect = Command.extract_options(args, ['>'])
+                if not redirect or not args:
+                    log2('Please specify file name: e.g. report > /tmp/report.log')
+                    return 'no-report-destination'
+
+                results = run_checks(state.sts, state.namespace, state.pod, show_out=show)
+                output = CheckResult.report(results)
+                with open(args[0], "w") as json_file:
+                    json.dump(output, json_file, indent=2)
+                    log2(f'Report stored in {args[0]}.')
+            else:
+                args, show = Command.extract_options(args, ['-s', '--show'])
+
+                results = run_checks(state.sts, state.namespace, state.pod, show_out=show)
+                output = CheckResult.report(results)
+                click.echo(json.dumps(output, indent=2))
+
+            return output
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {">": None})
 
     def help(self, _: ReplState):
         return f"{Report.COMMAND} > <file-name>\t generate report"

adam/commands/restart.py

@@ -1,3 +1,4 @@
+from adam.commands import extract_options
 from adam.commands.command import Command
 from adam.utils_k8s.pods import Pods
 from adam.utils_k8s.statefulsets import StatefulSets
@@ -26,34 +27,32 @@ class Restart(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        args, forced = Command.extract_options(args, '--force')
-        if not args:
-            if state.pod:
-                log2(f'Restarting {state.pod}...')
-                Pods.delete(state.pod, state.namespace)
-            else:
-                if not forced:
-                    log2('Please add --force for restarting all nodes in a cluster.')
-                    return 'force-needed'
-
-                log2(f'Restarting all pods from {state.sts}...')
-                for pod_name in StatefulSets.pod_names(state.sts, state.namespace):
-                    Pods.delete(pod_name, state.namespace)
-        else:
-            for arg in args:
-                Pods.delete(arg, state.namespace)
-
-        return state
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, '--force') as (args, forced):
+                if not args:
+                    if state.pod:
+                        log2(f'Restarting {state.pod}...')
+                        Pods.delete(state.pod, state.namespace)
+                    else:
+                        if not forced:
+                            log2('Please add --force for restarting all nodes in a cluster.')
+                            return 'force-needed'
+
+                        log2(f'Restarting all pods from {state.sts}...')
+                        for pod_name in StatefulSets.pod_names(state.sts, state.namespace):
+                            Pods.delete(pod_name, state.namespace)
+                else:
+                    for arg in args:
+                        Pods.delete(arg, state.namespace)
+
+                return state
 
     def completion(self, state: ReplState):
-        if state.pod:
-            return {Restart.COMMAND: None}
-        elif state.sts:
-            return {Restart.COMMAND: {p: None for p in StatefulSets.pod_names(state.sts, state.namespace)}}
+        if super().completion(state):
+            if state.pod:
+                return {Restart.COMMAND: None}
+            elif state.sts:
+                return {Restart.COMMAND: {p: None for p in StatefulSets.pod_names(state.sts, state.namespace)}}
 
         return {}
 

adam/commands/rollout.py

@@ -2,6 +2,7 @@ import datetime
 from kubernetes import client
 from kubernetes.client.rest import ApiException
 
+from adam.commands import extract_options
 from adam.commands.command import Command
 from adam.commands.watch import Watch
 from adam.utils_k8s.statefulsets import StatefulSets
@@ -31,32 +32,28 @@ class RollOut(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, '--force') as (args, forced):
+                restarted, rollingout = StatefulSets.restarted_at(state.sts, state.namespace)
+                if rollingout and not forced:
+                    log2(f"* Cluster is being rolled out for {duration(restarted)}. Please wait until it's done or use --force.")
 
-        args, forced = Command.extract_options(args, '--force')
+                    return state
 
-        restarted, rollingout = StatefulSets.restarted_at(state.sts, state.namespace)
-        if rollingout and not forced:
-            log2(f"* Cluster is being rolled out for {duration(restarted)}. Please wait until it's done or use --force.")
+                self.rolling_restart(state.sts, state.namespace)
 
-            return state
+                auto_watch = False
+                if (auto_watch_cmds := Config().get('watch.auto', 'rollout')):
+                    cmds = [c.strip(' ') for c in auto_watch_cmds.split(',')]
+                    if self.command() in cmds:
+                        auto_watch = True
+                        log2('Rolling out cluster with auto watch...')
+                        Watch().run('watch', state)
 
-        self.rolling_restart(state.sts, state.namespace)
+                if not auto_watch:
+                    log2('Rolling out cluster...')
 
-        auto_watch = False
-        if (auto_watch_cmds := Config().get('watch.auto', 'rollout')):
-            cmds = [c.strip(' ') for c in auto_watch_cmds.split(',')]
-            if self.command() in cmds:
-                auto_watch = True
-                log2('Rolling out cluster with auto watch...')
-                Watch().run('watch', state)
-
-        if not auto_watch:
-            log2('Rolling out cluster...')
-
-        return state
+                return state
 
     def rolling_restart(self, statefulset, namespace):
         # kubectl rollout restart statefulset <statefulset-name>
@@ -82,9 +79,7 @@ class RollOut(Command):
             log2("Exception when calling AppsV1Api->read_namespaced_statefulset_status: %s\n" % e)
 
     def completion(self, state: ReplState):
-        if state.pod:
-            return {}
-        elif state.sts:
+        if super().completion(state):
             return {RollOut.COMMAND: None}
 
         return {}

adam/commands/shell.py

@@ -1,7 +1,9 @@
 import os
 
+from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.repl_state import ReplState
+from adam.utils import log2
 
 class Shell(Command):
     COMMAND = ':sh'
@@ -18,13 +20,19 @@ class Shell(Command):
     def command(self):
         return Shell.COMMAND
 
-    def run(self, cmd: str, s0: ReplState):
+    def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
-            return super().run(cmd, s0)
+            return super().run(cmd, state)
 
-        _, args = self.apply_state(args, s0)
+        with self.validate(args, state) as (args, _):
+            with validate_args(args, state, at_least=0) as args_str:
+                if args_str:
+                    os.system(args_str)
+                    log2()
+                else:
+                    os.system('QING_DROPPED=true bash')
 
-        os.system('QING_DROPPED=true bash')
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/show/show.py

@@ -1,25 +1,23 @@
 import click
 
-from adam.commands.audit.show_last10 import ShowLast10
-from adam.commands.command import Command
+from adam.commands.app.show_app_actions import ShowAppActions
+from adam.commands.app.show_app_id import ShowAppId
+from adam.commands.app.show_app_queues import ShowAppQueues
+from adam.commands.intermediate_command import IntermediateCommand
 from adam.commands.medusa.medusa_show_backupjobs import MedusaShowBackupJobs
 from adam.commands.medusa.medusa_show_restorejobs import MedusaShowRestoreJobs
-from adam.commands.show.show_app_actions import ShowAppActions
-from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.show.show_host import ShowHost
 from adam.commands.show.show_login import ShowLogin
 from .show_params import ShowParams
-from .show_app_id import ShowAppId
 from .show_cassandra_status import ShowCassandraStatus
 from .show_cassandra_version import ShowCassandraVersion
 from .show_commands import ShowKubectlCommands
 from .show_processes import ShowProcesses
-from .show_repairs import ShowRepairs
+from .show_cassandra_repairs import ShowCassandraRepairs
 from .show_storage import ShowStorage
 from .show_adam import ShowAdam
-from adam.repl_state import ReplState
 
-class Show(Command):
+class Show(IntermediateCommand):
     COMMAND = 'show'
 
     # the singleton pattern
@@ -28,27 +26,14 @@ class Show(Command):
 
         return cls.instance
 
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
     def command(self):
         return Show.COMMAND
 
-    def run(self, cmd: str, state: ReplState):
-        if not(args := self.args(cmd)):
-            return super().run(cmd, state)
-
-        return super().intermediate_run(cmd, state, args, Show.cmd_list())
-
-    def cmd_list():
+    def cmd_list(self):
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
-                ShowParams(), ShowProcesses(), ShowRepairs(), ShowStorage(), ShowAdam(),
-                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs(),
-                ShowLast10()]
-
-    def completion(self, state: ReplState):
-        return super().completion(state)
+                ShowParams(), ShowProcesses(), ShowCassandraRepairs(), ShowStorage(), ShowAdam(),
+                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 
 class ShowCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Show.COMMAND, Show.cmd_list(), show_cluster_help=True)
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Show.COMMAND, Show().cmd_list(), show_cluster_help=True)

adam/commands/show/show_adam.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-from adam.utils import lines_to_tabular, log2
+from adam.utils import tabulize, log2
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -34,10 +34,10 @@ class ShowAdam(Command):
 
         package = os.path.dirname(os.path.abspath(__file__))
         package = package.split('/adam/')[0] + '/adam'
-        log2(lines_to_tabular([
+        tabulize([
             f'version\t{__version__}',
             f'source\t{package}'
-        ], separator='\t'))
+        ], separator='\t', to=2)
 
         return state
 

adam/commands/show/show_cassandra_repairs.py

@@ -0,0 +1,35 @@
+from adam.commands.command import Command
+from adam.commands.cql.utils_cql import cassandra
+from adam.repl_state import ReplState, RequiredState
+
+class ShowCassandraRepairs(Command):
+    COMMAND = 'show cassandra repairs'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowCassandraRepairs, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowCassandraRepairs.COMMAND
+
+    def required(self):
+        return RequiredState.CLUSTER_OR_POD
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        with self.validate(args, state) as (args, state):
+            with cassandra(state) as pods:
+                return pods.nodetool('repair_admin list')
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{ShowCassandraRepairs.COMMAND}\t show Cassandra repairs'