kaqing 2.0.188__py3-none-any.whl → 2.0.211__py3-none-any.whl

adam/commands/postgres/postgres_databases.py

@@ -144,9 +144,8 @@ class PostgresDatabases:
             env_prefix = f'PGPASSWORD="{password}"'
 
             r = Pods.exec(pod_name, container_name, state.namespace, cmd, show_out=show_out, backgrounded=backgrounded, env_prefix=env_prefix)
-            if r and Config().get('repl.history.push-cat-remote-log-file', True):
-                if r.log_file and ReplSession().prompt_session:
-                    ReplSession().prompt_session.history.append_string(f'@{r.pod} cat {r.log_file}')
+            if r and r.log_file:
+                ReplSession().append_history(f':cat {r.log_file}')
 
             return r
 

adam/commands/postgres/postgres_ls.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.ls import Ls
+from adam.commands.fs.ls import Ls
 from adam.repl_state import ReplState, RequiredState
 
 class PostgresLs(Command):

adam/commands/postgres/utils_postgres.py

@@ -1,6 +1,7 @@
 import functools
 
 from adam.commands.postgres.postgres_databases import PostgresDatabases, pg_path
+from adam.config import Config
 from adam.repl_state import ReplState
 from adam.utils import log2, wait_log
 from adam.utils_k8s.pods import Pods
@@ -62,7 +63,7 @@ class PostgresPodService:
         if isinstance(args, list):
             query = ' '.join(args)
 
-        PostgresDatabases.run_sql(state, query, backgrounded=backgrounded)
+        PostgresDatabases.run_sql(state, query, show_out=Config().is_debug(), backgrounded=backgrounded)
 
 class PostgresExecHandler:
     def __init__(self, state: ReplState, backgrounded=False):

adam/commands/preview_table.py

@@ -27,7 +27,7 @@ class PreviewTable(Command):
 
         with self.validate(args, state) as (args, state):
             with validate_args(args, state, at_least=1) as table:
-                Devices.device(state).preview(table, state)
+                Devices.of(state).preview(table, state)
 
             return state
 

adam/commands/restart_cluster.py

@@ -0,0 +1,47 @@
+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
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class RestartCluster(Command):
+    COMMAND = 'restart cluster'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(RestartCluster, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return RestartCluster.COMMAND
+
+    def required(self):
+        return RequiredState.CLUSTER
+
+    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 extract_options(args, '--force') as (args, forced):
+                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)
+
+                return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {'--force': None})
+
+    def help(self, _: ReplState):
+        return f"{RestartCluster.COMMAND} --force\t restart all the nodes in the cluster"

adam/commands/restart_node.py

@@ -0,0 +1,51 @@
+from adam.commands import extract_options
+from adam.commands.command import Command
+from adam.commands.devices.devices import Devices
+from adam.utils_k8s.pods import Pods
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class RestartNode(Command):
+    COMMAND = 'restart node'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(RestartNode, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return RestartNode.COMMAND
+
+    def required(self):
+        return RequiredState.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):
+            if not state.pod:
+                log2("'pod' is required")
+
+                return 'pod-needed'
+
+            with extract_options(args, '--force') as (args, forced):
+                if not forced:
+                    log2('Please add --force for restarting pod.')
+
+                    return 'force-needed'
+
+                log2(f'Restarting {state.pod}...')
+                Pods.delete(state.pod, state.namespace)
+
+                return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {'--force': None}, pods=Devices.of(state).pods(state, '-'))
+
+    def help(self, _: ReplState):
+        return f"{RestartNode.COMMAND} --force\t restart the node"

adam/commands/restart_nodes.py

@@ -0,0 +1,47 @@
+from adam.commands import extract_options, validate_args
+from adam.commands.command import Command
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.statefulsets import StatefulSets
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class RestartNodes(Command):
+    COMMAND = 'restart nodes'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(RestartNodes, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return RestartNodes.COMMAND
+
+    def required(self):
+        return RequiredState.CLUSTER
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        with self.validate(args, state, apply=False) as (args, state):
+            with extract_options(args, '--force') as (args, forced):
+                with validate_args(args, state, name='pod name'):
+                    if not forced:
+                        log2('Please add --force for restarting nodes.')
+
+                        return 'force-needed'
+
+                    for arg in args:
+                        Pods.delete(arg, state.namespace)
+
+                    return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state, lambda: {p: {'--force': None} for p in StatefulSets.pod_names(state.sts, state.namespace)})
+
+    def help(self, _: ReplState):
+        return f"{RestartNodes.COMMAND} <pod-name>... --force\t restart Cassandra nodes"

adam/commands/show/show_cassandra_status.py

@@ -8,13 +8,14 @@ from adam.checks.gossip import Gossip
 from adam.columns.columns import Columns
 from adam.commands import extract_options, extract_trailing_options
 from adam.commands.command import Command
+from adam.commands.commands_utils import write_to_kaqing_log_file
 from adam.commands.cql.utils_cql import cassandra
 from adam.config import Config
 from adam.repl_session import ReplSession
 from adam.utils_issues import IssuesUtils
 from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import SORT, tabulize, log2, log_exc
+from adam.utils import SORT, log_dir, tabulize, log2, log_exc
 from adam.checks.status import parse_nodetool_status
 
 class ShowCassandraStatus(Command):
@@ -105,15 +106,7 @@ class ShowCassandraStatus(Command):
         r = tabulize(status, lambda s: ','.join([c.host_value(check_results, s) for c in columns]), header=header, separator=',', sorted=SORT, to = 0 if backgrounded else 1)
 
         if backgrounded:
-            log_prefix = Config().get('log-prefix', '/tmp/qing')
-            log_file = f'{log_prefix}-{datetime.now().strftime("%d%H%M%S")}.log'
-
-            with open(log_file, 'w') as f:
-                f.write(r)
-
-            ReplSession().append_history(f':sh cat {log_file}')
-
-            r = log_file
+            r = write_to_kaqing_log_file(r)
 
         IssuesUtils.show(check_results)
 

adam/commands/show/show_cli_commands.py

@@ -22,7 +22,7 @@ class ShowKubectlCommands(Command):
         return RequiredState.CLUSTER_OR_POD
 
     def run(self, cmd: str, state: ReplState):
-        if not self.args(cmd):
+        if not (args := self.args(cmd)):
             return super().run(cmd, state)
 
         with self.validate(args, state) as (args, state):

adam/commands/show/show_processes.py

@@ -37,7 +37,7 @@ class ShowProcesses(Command):
                             header = Config().get('processes-qing.header', 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT')
 
                     with cassandra(state) as pods:
-                        pods.display_table(cols, header, show_out=show_out, backgrounded=backgrounded)
+                        pods.display_table(cols, header, show_out=show_out, backgrounded=backgrounded, msg='Checking processes')
 
                     return state
 

adam/commands/show/show_storage.py

@@ -3,6 +3,7 @@ from adam.commands.command import Command
 from adam.commands.cql.utils_cql import cassandra
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
+from adam.utils import ing
 
 class ShowStorage(Command):
     COMMAND = 'show storage'
@@ -32,7 +33,7 @@ class ShowStorage(Command):
                     cols = Config().get('storage.columns', 'pod,volume_root,volume_cassandra,snapshots,data,compactions')
                     header = Config().get('storage.header', 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS')
                     with cassandra(state) as pods:
-                        pods.display_table(cols, header, show_out=show_out, backgrounded=backgrounded)
+                        pods.display_table(cols, header, show_out=show_out, backgrounded=backgrounded, msg='Checking storage')
 
                     return state
 

adam/config.py

@@ -3,17 +3,13 @@ from typing import TypeVar, cast
 import yaml
 
 from . import __version__
-from adam.utils import LogConfig, copy_config_file, get_deep_keys, log2
+from adam.utils import ConfigHolder, ConfigReadable, copy_config_file, get_deep_keys, log2
 
 T = TypeVar('T')
 
-class Config:
+class Config(ConfigReadable):
     EMBEDDED_PARAMS = {}
 
-    LogConfig.is_debug = lambda: Config().is_debug()
-    LogConfig.is_debug_complete = lambda: Config().get('debugs.complete', False)
-    LogConfig.is_debug_timing = lambda: Config().get('debugs.timings', False)
-
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
         if not hasattr(cls, 'instance'): cls.instance = super(Config, cls).__new__(cls)
@@ -29,6 +25,8 @@ class Config:
             except:
                 with open(copy_config_file(f'params.yaml.{__version__}', 'adam.embedded_params', show_out=not is_user_entry)) as f:
                     self.params = cast(dict[str, any], yaml.safe_load(f))
+
+            ConfigHolder().config = self
         elif not hasattr(self, 'params'):
             with open(copy_config_file(f'params.yaml.{__version__}', 'adam.embedded_params', show_out=not is_user_entry)) as f:
                 self.params = cast(dict[str, any], yaml.safe_load(f))

adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'container-name': 'c3-server', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'auto-repair': {'elapsed_hours': 12}, 'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'repair-partition-tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results', 'repair-cluster-tables': 'cluster'}, 'queries': {'last10': "SELECT * FROM audit\nWHERE drive <> 'z' and ({date_condition})\nORDER BY ts DESC LIMIT {limit}", 'slow10': "SELECT * FROM audit\nWHERE drive <> 'z' and ({date_condition})\nORDER BY CAST(duration AS REAL) DESC LIMIT {limit}", 'top10': "SELECT min(c) AS cluster, line, COUNT(*) AS cnt, avg(CAST(duration AS REAL)) AS duration\nFROM audit WHERE drive <> 'z' and ({date_condition})\nGROUP BY line ORDER BY cnt DESC LIMIT {limit}"}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'download': {'workers': 8}, 'export': {'workers': 8, 'csv_dir': '/c3/cassandra/tmp', 'column_counts_query': 'select id, count(id) as columns from {table} group by id order by columns desc limit 10', 'default-importer': 'sqlite', 'sqlite': {'workers': 8, 'columns': '<row-key>', 'local-db-dir': '/tmp/qing-db'}, 'athena': {'workers': 8, 'columns': '<keys>', 'bucket': 'c3.ops--qing'}, 'csv': {'workers': 8, 'columns': '<row-key>'}, 'log-prefix': '/tmp/qing'}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'local-tmp-dir': '/tmp/qing-db', 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'log-prefix': '/tmp/qing', 'nodetool': {'workers': 96, 'commands_in_line': 40, 'status': {'workers': 32, 'samples': 3, 'commands_in_line': 40}}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu-metrics,mem', 'header': 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT'}, 'processes-qing': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'c', 'a': {'auto-enter': 'c3/c3'}, 'c': {'auto-enter': 'cluster'}, 'x': {'auto-enter': 'latest'}, 'history': {'push-cat-log-file': True, 'push-cat-remote-log-file': True}, 'background-process': {'auto-nohup': True}}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'auto-complete': {'c': {'tables': 'lazy'}, 'x': {'tables': 'lazy'}, 'cli': {'cp': 'jit'}, 'export': {'databases': 'jit'}, 'medusa': {'backups': 'jit'}, 'reaper': {'schedules': 'lazy'}}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'container-name': 'c3-server', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'auto-repair': {'elapsed_hours': 12}, 'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'repair-partition-tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results', 'repair-cluster-tables': 'cluster'}, 'queries': {'last10': "SELECT * FROM audit\nWHERE drive <> 'z' and ({date_condition})\nORDER BY ts DESC LIMIT {limit}", 'slow10': "SELECT * FROM audit\nWHERE drive <> 'z' and ({date_condition})\nORDER BY CAST(duration AS REAL) DESC LIMIT {limit}", 'top10': "SELECT min(c) AS cluster, line, COUNT(*) AS cnt, avg(CAST(duration AS REAL)) AS duration\nFROM audit WHERE drive <> 'z' and ({date_condition})\nGROUP BY line ORDER BY cnt DESC LIMIT {limit}"}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'download': {'workers': 8}, 'export': {'workers': 8, 'csv_dir': '/c3/cassandra/tmp', 'column_counts_query': 'select id, count(id) as columns from {table} group by id order by columns desc limit 10', 'default-importer': 'sqlite', 'sqlite': {'workers': 8, 'columns': '<row-key>', 'local-db-dir': '/tmp/qing-db/q/export/db'}, 'athena': {'workers': 8, 'columns': '<keys>', 'bucket': 'c3.ops--qing'}, 'csv': {'workers': 8, 'columns': '<row-key>'}, 'log-dir': '/tmp/qing-db/q/export/logs'}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'local-qing-dir': '/tmp/qing-db/q', 'local-downloads-dir': '/tmp/qing-db/q/downloads', 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'log-dir': '/tmp/qing-db/q/logs', 'nodetool': {'workers': 96, 'commands_in_line': 40, 'status': {'workers': 32, 'samples': 3, 'commands_in_line': 40}}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu-metrics,mem', 'header': 'POD_NAME,M_CPU(USAGE/LIMIT),MEM/LIMIT'}, 'processes-qing': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,Q_CPU/TOTAL,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'c', 'a': {'auto-enter': 'c3/c3'}, 'c': {'auto-enter': 'cluster'}, 'x': {'auto-enter': 'latest'}, 'history': {'push-cat-log-file': True, 'push-cat-remote-log-file': True}, 'background-process': {'auto-nohup': True}}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'auto-complete': {'c': {'tables': 'lazy'}, 'x': {'tables': 'lazy'}, 'cli': {'cp': 'jit'}, 'export': {'databases': 'jit'}, 'medusa': {'backups': 'jit'}, 'reaper': {'schedules': 'jit'}}, 'debug': False, 'debugs': {'complete': False, 'timings': False, 'exit-on-error': False}}

adam/repl.py

@@ -16,7 +16,7 @@ from adam.log import Log
 from adam.repl_commands import ReplCommands
 from adam.repl_session import ReplSession
 from adam.repl_state import ReplState
-from adam.utils import clear_wait_log_flag, debug_trace, deep_sort_dict, tabulize, log2, log_exc, log_timing
+from adam.utils import CommandLog, clear_wait_log_flag, debug_trace, deep_sort_dict, tabulize, log2, log_exc, log_timing
 from adam.apps import Apps
 from adam.utils_repl.repl_completer import ReplCompleter, merge_completions
 from . import __version__
@@ -43,7 +43,7 @@ def enter_repl(state: ReplState):
 
     Log.log2(f'kaqing {__version__}')
 
-    Devices.device(state).enter(state)
+    Devices.of(state).enter(state)
 
     kb = KeyBindings()
 
@@ -142,8 +142,10 @@ def enter_repl(state: ReplState):
                 if cmd and (state.device != ReplState.L or Config().get('audit.log-audit-queries', False)):
                     exec.submit(Audits.log, cmd, state.namespace, state.device, time.time() - s0, get_audit_extra(result))
 
+                CommandLog.close_log_file()
+
 def try_device_default_action(state: ReplState, cmds: Command, cmd_list: list[Command], cmd: str):
-    action_taken, result = Devices.device(state).try_fallback_action(cmds, state, cmd)
+    action_taken, result = Devices.of(state).try_fallback_action(cmds, state, cmd)
 
     if not action_taken:
         log2(f'* Invalid command: {cmd}')

adam/repl_commands.py

@@ -1,13 +1,16 @@
-from adam.commands.alter_tables import AlterTables
 from adam.commands.app.app import App
 from adam.commands.app.app_ping import AppPing
 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.audit.audit import Audit
-from adam.commands.cat import Cat
+from adam.commands.fs.cat import Cat
 from adam.commands.code import Code
-from adam.commands.download_file import DownloadFile
+from adam.commands.cql.alter_tables import AlterTables
+from adam.commands.debug.debug import Debug
+from adam.commands.download_cassandra_log import DownloadCassandraLog
+from adam.commands.fs.cat_local import CatLocal
+from adam.commands.fs.download_file import DownloadFile
 from adam.commands.deploy.code_start import CodeStart
 from adam.commands.deploy.code_stop import CodeStop
 from adam.commands.deploy.deploy import Deploy
@@ -38,14 +41,17 @@ from adam.commands.export.show_column_counts import ShowColumnCounts
 from adam.commands.export.show_export_databases import ShowExportDatabases
 from adam.commands.export.show_export_session import ShowExportSession
 from adam.commands.export.show_export_sessions import ShowExportSessions
-from adam.commands.find_files import FindLocalFiles
-from adam.commands.find_processes import FindProcesses
-from adam.commands.head import Head
+from adam.commands.fs.find_files import FindLocalFiles
+from adam.commands.fs.find_processes import FindProcesses
+from adam.commands.fs.head import Head
+from adam.commands.fs.ls_local import LsLocal
 from adam.commands.kubectl import Kubectl
-from adam.commands.shell import Shell
+from adam.commands.restart_cluster import RestartCluster
+from adam.commands.restart_node import RestartNode
+from adam.commands.fs.shell import Shell
 from adam.commands.clipboard_copy import ClipboardCopy
 from adam.commands.bash.bash import Bash
-from adam.commands.cd import Cd
+from adam.commands.fs.cd import Cd
 from adam.commands.check import Check
 from adam.commands.command import Command
 from adam.commands.cql.cqlsh import Cqlsh
@@ -53,15 +59,15 @@ from adam.commands.exit import Exit
 from adam.commands.medusa.medusa import Medusa
 from adam.commands.param_get import GetParam
 from adam.commands.issues import Issues
-from adam.commands.ls import Ls
+from adam.commands.fs.ls import Ls
 from adam.commands.nodetool import NodeTool
 from adam.commands.postgres.postgres import Postgres, PostgresPg
 from adam.commands.preview_table import PreviewTable
 from adam.commands.pwd import Pwd
 from adam.commands.reaper.reaper import Reaper
 from adam.commands.repair.repair import Repair
-from adam.commands.report import Report
-from adam.commands.restart import Restart
+from adam.commands.generate_report import GenerateReport
+from adam.commands.restart_nodes import RestartNodes
 from adam.commands.rollout import RollOut
 from adam.commands.param_set import SetParam
 from adam.commands.show.show import Show
@@ -82,7 +88,7 @@ class ReplCommands:
         cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_ops() + ReplCommands.postgres_ops() + \
             ReplCommands.app_ops() + ReplCommands.audit_ops() + ReplCommands.export_ops() + ReplCommands.tools() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [App(), Audit(), Reaper(), Repair(), Deploy(), Show(), Undeploy()]
+        intermediate_cmds: list[Command] = [App(), Audit(), Reaper(), Repair(), Debug(), Deploy(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -99,18 +105,18 @@ class ReplCommands:
         return deduped
 
     def navigation() -> list[Command]:
-        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), DeviceExport(),
-                Cd(), Cat(), Head(), DownloadFile(), FindLocalFiles(), FindProcesses(), Pwd(), ClipboardCopy(),
+        return [Ls(), LsLocal(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), DeviceExport(),
+                Cd(), Cat(), CatLocal(), Head(), DownloadFile(), FindLocalFiles(), FindProcesses(), Pwd(), ClipboardCopy(),
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_ops() -> list[Command]:
-        return [Cqlsh(), ShowCassandraStatus(), ShowCassandraVersion(), ShowCassandraRepairs(), ShowStorage(), ShowProcesses(),
-                Check(), Issues(), NodeTool(), Report(), AlterTables(), Bash(),
+        return [Cqlsh(), DownloadCassandraLog(), ShowCassandraStatus(), ShowCassandraVersion(), ShowCassandraRepairs(), ShowStorage(), ShowProcesses(),
+                Check(), Issues(), NodeTool(), GenerateReport(), AlterTables(), Bash(),
                 ExportTables(), ExportXSelect(), ExportUse(),  ShowExportDatabases(), ShowColumnCounts(),
                 DropExportDatabase(), DropExportDatabases(),
                 ShowExportSessions(), ShowExportSession(), DownloadExportSession(),
                 CleanUpExportSessions(), CleanUpAllExportSessions(), ImportSession(), ImportCSVFiles()] + \
-                Medusa().cmd_list() + [Restart(), RollOut(), Watch()] + Reaper().cmd_list() + Repair().cmd_list()
+                Medusa().cmd_list() + [RestartNodes(), RestartNode(), RestartCluster(), RollOut(), Watch()] + Reaper().cmd_list() + Repair().cmd_list() + Debug().cmd_list()
 
     def postgres_ops() -> list[Command]:
         return [Postgres(), DeployPgAgent(), UndeployPgAgent(), PostgresPg()]

adam/repl_session.py

@@ -2,6 +2,7 @@ from prompt_toolkit import PromptSession
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 
 from adam.config import Config
+from adam.utils import ConfigHolder
 
 class ReplSession:
     # the singleton pattern
@@ -13,8 +14,8 @@ class ReplSession:
     def __init__(self):
         if not hasattr(self, 'prompt_session'):
             self.prompt_session = PromptSession(auto_suggest=AutoSuggestFromHistory())
+            ConfigHolder().append_command_history = self.append_history
 
     def append_history(self, entry: str):
-        if entry and Config().get('repl.history.push-cat-remote-log-file', True):
-            if self.prompt_session:
-                self.prompt_session.history.append_string(entry)
+        if entry and  self.prompt_session and Config().get('repl.history.push-cat-remote-log-file', True):
+            self.prompt_session.history.append_string(entry)

adam/repl_state.py

@@ -431,6 +431,12 @@ class ReplState:
 
         return state1
 
+    def with_pod(self, pod: str):
+        state1 = copy(self)
+        state1.pod = pod
+
+        return state1
+
 class DevicePodService:
     def __init__(self, handler: 'DeviceExecHandler'):
         self.handler = handler

adam/sql/async_executor.py

@@ -0,0 +1,44 @@
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
+import inspect
+import threading
+import traceback
+
+from adam.utils import log2, log_timing
+
+class AsyncExecutor:
+    # some lib does not handle asyncio loop properly, as sync exec submit does not work, use another async loop
+
+    lock = threading.Lock()
+    in_queue = set()
+
+    loop: asyncio.AbstractEventLoop = None
+    async_exec: ThreadPoolExecutor = None
+
+    def preload(action: callable, log_key: str = None):
+        with AsyncExecutor.lock:
+            if not AsyncExecutor.loop:
+                AsyncExecutor.loop = asyncio.new_event_loop()
+                AsyncExecutor.async_exec = ThreadPoolExecutor(max_workers=6, thread_name_prefix='async')
+                AsyncExecutor.loop.set_default_executor(AsyncExecutor.async_exec)
+
+            async def a():
+                try:
+                    arg_needed = len(action.__code__.co_varnames)
+
+                    if log_key:
+                        with log_timing(log_key):
+                            r = action(None) if arg_needed else action()
+                    else:
+                        r = action(None) if arg_needed else action()
+                    if inspect.isawaitable(r):
+                        await r
+
+                    AsyncExecutor.in_queue.remove(log_key)
+                except Exception as e:
+                    log2('preloading error', e, inspect.getsourcelines(action)[0][0])
+                    traceback.print_exc()
+
+            if log_key not in AsyncExecutor.in_queue:
+                AsyncExecutor.in_queue.add(log_key)
+                AsyncExecutor.async_exec.submit(lambda: AsyncExecutor.loop.run_until_complete(a()))

adam/sql/lark_completer.py

@@ -5,10 +5,11 @@ from prompt_toolkit.completion import CompleteEvent, Completer, Completion, Nest
 from prompt_toolkit.document import Document
 
 from adam.config import Config
+from adam.sql.async_executor import AsyncExecutor
 from adam.sql.lark_parser import LarkParser
 from adam.utils import debug, log_timing, offload
 from adam.utils_repl.appendable_completer import AppendableCompleter
-from adam.utils_repl.repl_completer import merge_completions, preload
+from adam.utils_repl.repl_completer import merge_completions
 
 __all__ = [
     "LarkCompleter",
@@ -33,7 +34,7 @@ class LarkCompleter(Completer, AppendableCompleter):
         self.nested: NestedCompleter = None
         self.options_lambda = options_lambda
         if options_lambda and auto == 'lazy':
-            preload(options_lambda, log_key=name)
+            AsyncExecutor.preload(options_lambda, log_key=name)
 
         self.variant = variant
         self.parser = None
@@ -60,7 +61,7 @@ class LarkCompleter(Completer, AppendableCompleter):
         for key, value in self.expandables.items():
             if callable(value):
                 if self.auto_complete(key) == 'lazy':
-                    preload(value, log_key=key)
+                    AsyncExecutor.preload(value, log_key=key)
 
     def from_lambda(name: str, options_lambda: callable, auto: str = 'lazy'):
         return LarkCompleter(name=name, options_lambda=options_lambda, auto=auto, variant=None)
@@ -131,8 +132,9 @@ class LarkCompleter(Completer, AppendableCompleter):
                     'show_column_counts_command.path.identifier_ref': 'tables',
                     'export_statement.export_tables.keyspace_name': 'keyspaces',
 
-                    'alter_cql_table_statement.properties.property.property_name': 'table-props',
                     'alter_tables_statement.properties.property.property_name': 'table-props',
+                    'alter_cql_table_statement.properties.property.property_name': 'table-props',
+                    'alter_tables_statement.properties.property.property_value.literal': 'table-props-value',
                     'alter_cql_table_statement.properties.property.property_value.literal': 'table-props-value',
 
                     'select_clause.projection.result_expr.expr.path.identifier_ref': 'columns',