From: francisco.garcia Date: Tue, 23 Jan 2024 11:09:50 +0000 (+0100) Subject: Added custom version to get more verbose X-Git-Tag: Release-15.0.2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43076ff93697a379c948f227c96028396dac2f37;p=thirdparty%2Fbacula.git Added custom version to get more verbose --- 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 30f418c24..8a7a6f03c 100644 --- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/io/log.py +++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/io/log.py @@ -116,4 +116,4 @@ class Log: @staticmethod def save_exception(e): - logging.debug(e) + logging.exception(e) diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pods.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pods.py index 2aff8aa2a..3f88b37d7 100644 --- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pods.py +++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pods.py @@ -42,6 +42,7 @@ def pods_read_namespaced(corev1api, namespace, name): def pods_namespaced_specs(corev1api, namespace, labels=""): podslist = [] pods = corev1api.list_namespaced_pod(namespace=namespace, watch=False, label_selector=labels) + logging.debug('[CUSTOM] Get items of pods: {}'.format(pods.items)) for pod in pods.items: podslist.append(pod) # logging.debug("pods_namespaced_specs:{}".format(podslist)) diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pvcdata.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pvcdata.py index 71a29b58d..17780d99f 100644 --- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pvcdata.py +++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/pvcdata.py @@ -49,7 +49,12 @@ def pvcdata_list_update_node_names(corev1api, namespace, pvcdatalist): """ # here we collect node_names for proper backup pod deployment pods = pods_namespaced_specs(corev1api, namespace=namespace) + logging.debug('[CUSTOM] Get pods:{}'.format(pods)) for pod in pods: + logging.debug('[CUSTOM] Pod: {}'.format(pod)) + logging.debug('[CUSTOM] Pod Specs: {}'.format(pod.spec)) + if pod.spec is not None: + logging.debug('[CUSTOM] POD SPEC is None') for vol in pod.spec.volumes: if vol.persistent_volume_claim is not None: pvcname = vol.persistent_volume_claim.claim_name @@ -72,8 +77,12 @@ def pvcdata_get_namespaced(corev1api, namespace, pvcname, pvcalias=None): dict: pvc data dict """ pvc = persistentvolumeclaims_read_namespaced(corev1api, namespace, pvcname) + logging.debug('[CUSTOM] Read PVC: ') + logging.debug(pvc) + pvcspec = pvc.spec storageclassname = pvcspec.storage_class_name + logging.debug('[CUSTOM] Get size:' + str(pvcspec.resources)) pvcsize = pvcspec.resources.requests.get('storage', '-1') pvcdata = { 'name': pvcname, @@ -87,6 +96,8 @@ def pvcdata_get_namespaced(corev1api, namespace, pvcname, pvcalias=None): size=pvcsize), } pvcdatalist = pvcdata_list_update_node_names(corev1api, namespace, {pvcname: pvcdata}) + logging.debug('[CUSTOM] Read persistent volume claim completed') + return pvcdatalist.get(pvcname) diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/kubernetes_plugin.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/kubernetes_plugin.py index d49d25c35..cff02907b 100644 --- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/kubernetes_plugin.py +++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/kubernetes_plugin.py @@ -544,6 +544,8 @@ class KubernetesPlugin(Plugin): def check_pvc_compatiblity_with_vsnapshot(self, namespace, pvc_name): pvc = self.get_pvcdata_namespaced(namespace, pvc_name) + logging.debug('[CUSTOM] Check Compatibilidy with Snapshots. Name: {}'.format(pvc_name, pvc)) + logging.debug('[CUSTOM] PVC: {}'.format(pvc)) return self.check_storage_compatibility_with_vsnapshot(pvc.get('storage_class_name')) def _check_config_map(self, file_info):