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

adam/commands/postgres/utils_postgres.py

@@ -1,12 +1,22 @@
 import functools
 
-from adam.commands.postgres.postgres_databases import PostgresDatabases
+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
 
 TestPG = [False]
 
+def direct_dirs(state: ReplState) -> list[str]:
+    with pg_path(state) as (host, database):
+        if database:
+            return ['..']
+        elif host:
+            return ['..'] + pg_database_names(state)
+        else:
+            return PostgresDatabases.host_names(state.namespace)
+
 def pg_database_names(state: ReplState):
     # cache on pg_path
     return _pg_database_names(state, state.pg_path)
@@ -53,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/reaper/reaper_schedule_activate.py

@@ -2,7 +2,11 @@ from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
+
+import nest_asyncio
+nest_asyncio.apply()
+
+import asyncio
 
 class ReaperScheduleActivate(Command):
     COMMAND = 'reaper activate schedule'
@@ -35,7 +39,7 @@ class ReaperScheduleActivate(Command):
                 return schedule_id
 
     def completion(self, state: ReplState):
-        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)}, auto_key='reaper.schedules')
 
     def help(self, _: ReplState):
         return f'{ReaperScheduleActivate.COMMAND} <schedule-id>\t resume reaper schedule'

adam/commands/reaper/reaper_schedule_start.py

@@ -2,7 +2,6 @@ from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
 
 class ReaperScheduleStart(Command):
     COMMAND = 'reaper start schedule'
@@ -35,7 +34,7 @@ class ReaperScheduleStart(Command):
                 return schedule_id
 
     def completion(self, state: ReplState):
-        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)}, auto_key='reaper.schedules')
 
     def help(self, _: ReplState):
         return f'{ReaperScheduleStart.COMMAND} <schedule-id>\t start reaper runs for schedule'

adam/commands/reaper/reaper_schedule_stop.py

@@ -2,7 +2,6 @@ from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
 
 class ReaperScheduleStop(Command):
     COMMAND = 'reaper stop schedule'
@@ -35,7 +34,7 @@ class ReaperScheduleStop(Command):
                 return schedule_id
 
     def completion(self, state: ReplState):
-        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)}, auto_key='reaper.schedules')
 
     def help(self, _: ReplState):
         return f'{ReaperScheduleStop.COMMAND} <schedule-id>\t pause reaper schedule'

adam/commands/reaper/utils_reaper.py

@@ -191,4 +191,13 @@ class Reapers:
         if is_service:
             return Reapers.svc_name()
         else:
-            return Reapers.pod_name(state)
+            return Reapers.pod_name(state)
+
+    def schedules_auto_completion(ids: callable):
+        auto = Config().get('reaper.schedules-auto-complete', 'off')
+
+        leaf = None
+        if auto == 'on':
+            leaf = {id: None for id in ids()}
+
+        return (leaf, auto == 'lazy')

adam/commands/repair/repair_scan.py

@@ -1,5 +1,3 @@
-import time
-
 from adam.commands.command import Command
 from adam.utils_k8s.pods import Pods
 from adam.repl_state import ReplState, RequiredState

adam/commands/repair/repair_stop.py

@@ -1,7 +1,6 @@
 from adam.commands.command import Command
 from adam.utils_k8s.jobs import Jobs
 from adam.repl_state import ReplState, RequiredState
-from adam.config import Config
 
 class RepairStop(Command):
     COMMAND = 'repair stop'

adam/commands/{show/show.py → show.py}

@@ -3,19 +3,20 @@ import click
 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.cassandra.show_cassandra_repairs import ShowCassandraRepairs
+from adam.commands.cassandra.show_cassandra_status import ShowCassandraStatus
+from adam.commands.cassandra.show_cassandra_version import ShowCassandraVersion
+from adam.commands.cassandra.show_processes import ShowProcesses
+from adam.commands.cassandra.show_storage import ShowStorage
+from adam.commands.cli.show_cli_commands import ShowKubectlCommands
+from adam.commands.config.show_params import ShowParams
+from adam.commands.debug.show_offloaded_completes import ShowOffloadedCompletes
+from adam.commands.fs.show_adam import ShowAdam
 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_host import ShowHost
-from adam.commands.show.show_login import ShowLogin
-from .show_params import ShowParams
-from .show_cassandra_status import ShowCassandraStatus
-from .show_cassandra_version import ShowCassandraVersion
-from .show_commands import ShowKubectlCommands
-from .show_processes import ShowProcesses
-from .show_cassandra_repairs import ShowCassandraRepairs
-from .show_storage import ShowStorage
-from .show_adam import ShowAdam
+from adam.commands.fs.show_host import ShowHost
+from adam.commands.app.show_login import ShowLogin
 
 class Show(IntermediateCommand):
     COMMAND = 'show'
@@ -30,7 +31,7 @@ class Show(IntermediateCommand):
         return Show.COMMAND
 
     def cmd_list(self):
-        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
+        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowOffloadedCompletes(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
                 ShowParams(), ShowProcesses(), ShowCassandraRepairs(), ShowStorage(), ShowAdam(),
                 ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 

adam/config.py

@@ -3,16 +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_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)
@@ -28,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', 'medusa': {'restore-auto-complete': False}, '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}, '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', 'table-props-value': 'jit'}, '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

@@ -10,17 +10,23 @@ from adam.commands.command_helpers import ClusterCommandHelper
 from adam.commands.devices.devices import Devices
 from adam.commands.help import Help
 from adam.config import Config
+from adam.sql.async_executor import AsyncExecutor
 from adam.utils_audits import Audits
 from adam.utils_k8s.kube_context import KubeContext
 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_merge_dicts, 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
+from adam.utils_repl.repl_completer import ReplCompleter, merge_completions
 from . import __version__
 
+import nest_asyncio
+nest_asyncio.apply()
+
+import asyncio
+
 def enter_repl(state: ReplState):
     if os.getenv('QING_DROPPED', 'false') == 'true':
         log2('You have dropped to bash from another qing instance. Please enter "exit" to go back to qing.')
@@ -38,7 +44,7 @@ def enter_repl(state: ReplState):
 
     Log.log2(f'kaqing {__version__}')
 
-    Devices.device(state).enter(state)
+    Devices.of(state).enter(state)
 
     kb = KeyBindings()
 
@@ -55,6 +61,8 @@ def enter_repl(state: ReplState):
         # use sorted command list only for auto-completion
         sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
         while True:
+            AsyncExecutor.reset()
+
             cmd: str = None
             result = None
             try:
@@ -68,7 +76,7 @@ def enter_repl(state: ReplState):
 
                         for c in sorted_cmds:
                             with log_exc(f'* {c.command()} command returned None completions.'):
-                                completions = log_timing(c.command(), lambda: deep_sort_dict(deep_merge_dicts(completions, c.completion(state))))
+                                completions = log_timing(c.command(), lambda: deep_sort_dict(merge_completions(completions, c.completion(state))))
 
                         # print(json.dumps(completions, indent=4))
                         completer = ReplCompleter.from_nested_dict(completions)
@@ -88,17 +96,17 @@ def enter_repl(state: ReplState):
                         return state, cmd
 
                     if state.device == ReplState.A and state.app_app or state.device == ReplState.P:
-                        state.push()
+                        state.push(pod_targetted=True)
 
                         state.app_pod = arry[0].strip('@')
                         cmd = ' '.join(arry[1:])
                     elif state.device == ReplState.P:
-                        state.push()
+                        state.push(pod_targetted=True)
 
                         state.app_pod = arry[0].strip('@')
                         cmd = ' '.join(arry[1:])
                     elif state.sts:
-                        state.push()
+                        state.push(pod_targetted=True)
 
                         state.pod = arry[0].strip('@')
                         cmd = ' '.join(arry[1:])
@@ -137,8 +145,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}')
@@ -175,6 +185,9 @@ def repl(kubeconfig: str, config: str, param: list[str], cluster:str, namespace:
     if not KubeContext.init_params(config, param):
         return
 
-    state = ReplState(device=Config().get('repl.start-drive', 'a'), ns_sts=cluster, namespace=namespace, in_repl=True)
+    state = ReplState(ns_sts=cluster, namespace=namespace, in_repl=True)
     state, _ = state.apply_device_arg(extra_args)
+    if not state.device:
+        state.device=Config().get('repl.start-drive', 'a')
+
     enter_repl(state)

adam/repl_commands.py

@@ -1,13 +1,33 @@
-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.cassandra.restart_cluster import RestartCluster
+from adam.commands.cassandra.restart_node import RestartNode
+from adam.commands.cassandra.restart_nodes import RestartNodes
+from adam.commands.cassandra.rollout import RollOut
+from adam.commands.cassandra.show_cassandra_repairs import ShowCassandraRepairs
+from adam.commands.cassandra.show_cassandra_status import ShowCassandraStatus
+from adam.commands.cassandra.show_cassandra_version import ShowCassandraVersion
+from adam.commands.cassandra.show_processes import ShowProcesses
+from adam.commands.cassandra.show_storage import ShowStorage
+from adam.commands.cassandra.watch import Watch
+from adam.commands.cli.clipboard_copy import ClipboardCopy
+from adam.commands.config.param_get import GetParam
+from adam.commands.config.param_set import SetParam
+from adam.commands.debug.show_offloaded_completes import ShowOffloadedCompletes
+from adam.commands.diag.check import Check
+from adam.commands.diag.generate_report import GenerateReport
+from adam.commands.diag.issues import Issues
+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.cassandra.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
@@ -31,58 +51,46 @@ from adam.commands.export.import_session import ImportSession
 from adam.commands.export.clean_up_export_sessions import CleanUpExportSessions
 from adam.commands.export.clean_up_all_export_sessions import CleanUpAllExportSessions
 from adam.commands.export.drop_export_databases import DropExportDatabases
-from adam.commands.export.export_select import ExportSelect
+from adam.commands.export.export_x_select import ExportXSelect
 from adam.commands.export.export_use import ExportUse
-from adam.commands.export.export_select_x import ExportSelectX
+from adam.commands.export.export_select import ExportSelect
 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.fs.rm import RmLocal
 from adam.commands.kubectl import Kubectl
-from adam.commands.shell import Shell
-from adam.commands.clipboard_copy import ClipboardCopy
+from adam.commands.fs.shell import Shell
 from adam.commands.bash.bash import Bash
-from adam.commands.cd import Cd
-from adam.commands.check import Check
+from adam.commands.fs.cd import Cd
 from adam.commands.command import Command
 from adam.commands.cql.cqlsh import Cqlsh
 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.nodetool import NodeTool
+from adam.commands.fs.ls import Ls
+from adam.commands.nodetool.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.fs.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.rollout import RollOut
-from adam.commands.param_set import SetParam
-from adam.commands.show.show import Show
-from adam.commands.show.show_cassandra_status import ShowCassandraStatus
-from adam.commands.show.show_cassandra_version import ShowCassandraVersion
-from adam.commands.show.show_commands import ShowKubectlCommands
-from adam.commands.show.show_host import ShowHost
-from adam.commands.show.show_login import ShowLogin
-from adam.commands.show.show_params import ShowParams
-from adam.commands.show.show_processes import ShowProcesses
-from adam.commands.show.show_cassandra_repairs import ShowCassandraRepairs
-from adam.commands.show.show_storage import ShowStorage
-from adam.commands.show.show_adam import ShowAdam
-from adam.commands.watch import Watch
+from adam.commands.cli.show_cli_commands import ShowKubectlCommands
+from adam.commands.fs.show_host import ShowHost
+from adam.commands.app.show_login import ShowLogin
+from adam.commands.config.show_params import ShowParams
+from adam.commands.fs.show_adam import ShowAdam
+from adam.commands.show import Show
 
 class ReplCommands:
     def repl_cmd_list() -> list[Command]:
         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 +107,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(),
-                GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
+        return [Ls(), LsLocal(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), DeviceExport(),
+                Cd(), Cat(), CatLocal(), Head(), DownloadFile(), FindLocalFiles(), FindProcesses(), Pwd(), ClipboardCopy(),
+                GetParam(), SetParam(), ShowOffloadedCompletes(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()] + RmLocal().cmd_list()
 
     def cassandra_ops() -> list[Command]:
-        return [Cqlsh(), ShowCassandraStatus(), ShowCassandraVersion(), ShowCassandraRepairs(), ShowStorage(), ShowProcesses(),
-                Check(), Issues(), NodeTool(), Report(), AlterTables(), Bash(),
-                ExportTables(), ExportSelect(), ExportUse(),  ShowExportDatabases(), ShowColumnCounts(),
+        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()]
@@ -122,7 +130,7 @@ class ReplCommands:
         return [Audit()] + Audit().cmd_list()
 
     def export_ops() -> list[Command]:
-        return [ExportSelectX(), DropExportDatabase(), DropExportDatabases(), ShowColumnCounts()]
+        return [ExportSelect(), DropExportDatabase(), DropExportDatabases(), ShowColumnCounts()]
 
     def tools() -> list[Command]:
         return [Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod(), Kubectl(), Code()]

adam/repl_session.py

@@ -1,6 +1,9 @@
 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
     def __new__(cls, *args, **kwargs):
@@ -10,4 +13,9 @@ class ReplSession:
 
     def __init__(self):
         if not hasattr(self, 'prompt_session'):
-            self.prompt_session = PromptSession(auto_suggest=AutoSuggestFromHistory())
+            self.prompt_session = PromptSession(auto_suggest=AutoSuggestFromHistory())
+            ConfigHolder().append_command_history = self.append_history
+
+    def append_history(self, entry: str):
+        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

@@ -61,6 +61,7 @@ class ReplState:
         self.bash_session = bash_session
         self.remote_dir = remote_dir
         self.original_state: ReplState = None
+        self.pod_targetted = False
 
         self.export_session: str = None
 
@@ -392,9 +393,10 @@ class ReplState:
         self.pop()
         self.bash_session = None
 
-    def push(self):
+    def push(self, pod_targetted=False):
         if not self.original_state:
             self.original_state = copy(self)
+            self.pod_targetted = pod_targetted
 
     def pop(self):
         if o := self.original_state:
@@ -409,6 +411,7 @@ class ReplState:
             self.namespace = o.namespace
 
             self.original_state = None
+            self.pod_targetted = False
 
     def pg_host_n_database(self):
         host = None
@@ -422,6 +425,18 @@ class ReplState:
 
         return host, database
 
+    def with_no_pod(self):
+        state1 = copy(self)
+        state1.pod = None
+
+        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,62 @@
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
+from copy import copy
+import inspect
+import threading
+import time
+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()
+    processed: dict[str, float] = {}
+    first_processed_at: float = None
+    last_processed_at: float = None
+
+    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:
+                    t0 = time.time()
+
+                    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)
+                    if log_key not in AsyncExecutor.processed:
+                        AsyncExecutor.processed[log_key] = time.time() - t0
+                    AsyncExecutor.last_processed_at = time.time()
+                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()))
+
+    def entries_in_queue():
+        # no locking
+        return copy(AsyncExecutor.in_queue), copy(AsyncExecutor.processed), AsyncExecutor.first_processed_at, AsyncExecutor.last_processed_at
+
+    def reset():
+        AsyncExecutor.first_processed_at = time.time()
+        AsyncExecutor.processed.clear()