k8s: Add more options to debug

diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/io/log.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/io/log.py
index 8a7a6f03c4d6d1c43bc1391a17b3b61ae03fe07e..25cc582d441d4dd378b882b860c6b0cc79e002dd 100644 (file)
--- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/io/log.py
+++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/io/log.py
@@ -52,6 +52,7 @@ class LogConfig(object):
     def handle_params(job_info, plugin_params):
         if "debug" in plugin_params and plugin_params["debug"]:
             LogConfig._create(job_info)
+            Log.debug_level = int(plugin_params["debug"])
         else:
             LogConfig._delete_pre_job_log()
 
@@ -79,6 +80,8 @@ class Log:
         Class with helper methods to send data to the Debug Log
     """
 
+    debug_level = 0
+
     @staticmethod
     def save_received_termination(packet_header):
         Log.save_received_packet(packet_header, "(TERMINATION PACKET)")
@@ -93,6 +96,10 @@ class Log:
 
     @staticmethod
     def save_received_packet(packet_header, packet_content):
+        if Log.debug_level <= 1:
+            return
+        if Log.debug_level == 2 and packet_header.decode()[0] == 'D':
+            return
         message = "Received Packet\n{}\n{}\n".format(packet_header.decode(), packet_content)
         logging.debug(message)
 
@@ -106,6 +113,10 @@ class Log:
 
     @staticmethod
     def save_sent_packet(packet_header, packet_content):
+        if Log.debug_level <= 1:
+            return
+        if Log.debug_level == 2 and packet_header[0] == 'D':
+            return
         message = "Sent Packet\n{}{}".format(packet_header, packet_content)
         logging.debug(message)
 

diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py
index 848f17ebc77c2fe3f33bbcefde2bffbdc73fdf0d..813e49f8ebbc9c5692ac89e01fb9bb0a9fd6ca9b 100644 (file)
--- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py
+++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py
@@ -95,6 +95,7 @@ class JobPodBacula(Job, metaclass=ABCMeta):
         self.backupimage = params.get('baculaimage', BACULABACKUPIMAGE)
         self.imagepullpolicy = ImagePullPolicy.process_param(params.get('imagepullpolicy'))
         self.backup_clone_compatibility = True
+        self.debug = params.get('debug', 0)
 
     def handle_pod_logs(self, connstream):
         logmode = ''
@@ -143,7 +144,8 @@ class JobPodBacula(Job, metaclass=ABCMeta):
             if not data:
                 logging.debug('handle_pod_data_recv:EOT')
                 break
-            logging.debug('handle_pod_data_recv:D' + str(len(data)))
+            if self.debug == '3':
+                logging.debug('handle_pod_data_recv:D' + str(len(data)))
             self._io.send_data(data)
 
     def handle_pod_data_send(self, connstream):
@@ -153,7 +155,8 @@ class JobPodBacula(Job, metaclass=ABCMeta):
                 logging.debug('handle_pod_data_send:EOT')
                 break
             self.connsrv.streamsend(data)
-            logging.debug('handle_pod_data_send:D{}'.format(len(data)))
+            if self.debug == '3':
+                logging.debug('handle_pod_data_send:D{}'.format(len(data)))
 
     def prepare_pod_yaml(self, namespace, pvcdata, mode='backup'):
         logging.debug('pvcdata: {}'.format(pvcdata))

diff --git a/bacula/src/plugins/fd/kubernetes-backend/setup.py b/bacula/src/plugins/fd/kubernetes-backend/setup.py
index e73fce90454eb925cb42c7e55f6910e6f64b35f0..6ae0b9d9be94ff887141b1a95a0a6018e9fb2b96 100644 (file)
--- a/bacula/src/plugins/fd/kubernetes-backend/setup.py
+++ b/bacula/src/plugins/fd/kubernetes-backend/setup.py
@@ -24,7 +24,7 @@ if sys.version_info < (3, 0):
 
 setup(
     name='baculak8s',
-    version='2.2.0',
+    version='2.3.0',
     author='Radoslaw Korzeniewski, Francisco Manuel Garcia Botella',
     author_email='radekk@korzeniewski.net, francisco.garcia@baculasystems.com',
     packages=find_packages(exclude=('tests', 'tests.*', 'docker')),