working tk

Author: Avi-Robusta

java_test_pod/test_pod_config.yaml

@@ -1,12 +1,12 @@
 kind: Pod
 apiVersion: v1
 metadata:
-  name: test_java_pod
+  name: test-java-pod
   labels:
-    app: test_java_pod
+    app: test-java-pod
 spec:
   containers:
-      - name: test_java_pod
+      - name: test-java-pod
         image: gcr.io/genuine-flight-317411/java-toolkit/test_java_pod
         ports:
         - containerPort: 1111
@@ -17,7 +17,7 @@ metadata:
   name: example-service
 spec:
   selector:
-    app: test_java_pod
+    app: test-java-pod
   ports:
     - port: 8222
       targetPort: 1111

src/java_toolkit/common/utils/process.py

@@ -1,7 +1,7 @@
 #!/usr/local/bin/python3
 import re
 from typing import List
-from .remote_ns_cmd import run_cmd_in_proc_namespace
+from .remote_ns_cmd import run_command
 
 import psutil
 import typer
@@ -15,8 +15,6 @@
     r"\d+:.+:/kubepods\.slice/kubepods-[^/]+\.slice/kubepods-[^/]+-pod([^/]+)\.slice/docker-([0-9a-f]{64})"
 )
 
-ps_regex = re.compile(r"\s*(?P<pid>.*?)\s+(?P<cmd>.*?)\s+(?P<cmd_args>.*?)$")
-
 app = typer.Typer()
 
 
@@ -68,26 +66,14 @@ def get_pid_info(pid: int) -> Process:
     proc = psutil.Process(pid)
     return Process(pid=pid, exe=proc.exe(), cmdline=proc.cmdline())
 
-def get_ns_processes(pid_in_ns: int, verbose: bool):
-    cmd = "ps -Ao pid,comm,args | grep -v PID"
-    processes = run_cmd_in_proc_namespace(pid_in_ns, cmd, verbose)
-    processes = processes.split('\n')
-    return_proc_list=[]
-    for proc_line in processes:
-        if not proc_line:
-            continue
-        match = ps_regex.match(proc_line)
-        if not match:
-            continue
-        pid = int(match.group("pid"))
-        exe = match.group("cmd")
-        cmdline = match.group("cmd_args")
-        if cmdline is None:
-            cmdline = []
-        else:
-            cmdline = cmdline.split(' ')
-        return_proc_list.append(Process(pid=pid, exe=exe, cmdline=cmdline))
-    return ProcessList(processes=return_proc_list)
+def get_nspid(pid_in_ns: int, verbose: bool):
+    cmd = f"cat /proc/{pid_in_ns}/status"
+    status_output = run_command(cmd, verbose)
+    nspid_regex = re.compile(r".+NSpid:\s+(?P<pid>.*?)\s+(?P<nspid>.*?)\s+", re.DOTALL)
+    match = nspid_regex.match(status_output)
+    if not match:
+        raise Exception(f"No match found for pid {pid_in_ns}")
+    return int(match.group("nspid"))
 
 
 

src/java_toolkit/main.py

@@ -8,23 +8,12 @@
 
 app = typer.Typer()
 
-def get_matching_local_pid(pid: int, verbose: bool):
-    process_cmd = ' '.join(get_pid_info(pid).cmdline)
-    ns_processes = get_ns_processes(pid, verbose)
-    process_list = []
-    for ns_process in ns_processes.processes:
-        ns_process_cmd = ' '.join(ns_process.cmdline)
-        if process_cmd == ns_process_cmd:
-            process_list.append(ns_process)
-    if len(process_list) != 1:
-        raise Exception(f"{len(process_list)} match the pid {pid} args '{process_cmd}'")
-    return process_list[0].pid
 
 def run_jdk_cmd(pid: int, cmd_missing_jdk_path:str, add_local_pid: bool, verbose: bool):
     with TmpRemotePodMounter(pid, JDK_PATH, LOCAL_MOUNT_PATH, verbose) as jdk_mounter:
         cmd = cmd_missing_jdk_path
         if add_local_pid:
-            local_pid = get_matching_local_pid(pid, verbose)
+            local_pid = get_nspid(pid, verbose)
             cmd = cmd.format(jdk_path=jdk_mounter.get_mounted_jdk_dir(),pid=local_pid)
         else:
             cmd = cmd.format(jdk_path=jdk_mounter.get_mounted_jdk_dir())
@@ -37,17 +26,11 @@ def pod_ps(pod_uid: str):
     typer.echo(get_pod_processes(pod_uid).json())
 
 
-@app.command()
-def pod_ns_ps(pid: int, verbose: bool = False):
-    typer.echo(get_ns_processes(pid, verbose).json())
-
-
 @app.command()
 def jmap(pid: int, verbose: bool = False):
     run_jdk_cmd(pid, JMAP_CMD, add_local_pid=True, verbose=verbose)
 
 
-
 @app.command()
 def jstack(pid: int, verbose: bool = False):
     run_jdk_cmd(pid, JSTACK_CMD, add_local_pid=True, verbose=verbose)