From 60213747a3eadf93437d96caf59530e28b847bb7 Mon Sep 17 00:00:00 2001 From: Eunsoo Park Date: Mon, 19 Feb 2018 16:57:15 +0900 Subject: [PATCH] Revert commits to use UID instead of SelfLink Revert "Remove object_uid" This reverts commit 17588f803f139fc11ad38bc91fc5c8e65efa833f. Revert "Improve pipeline/Async logging" This reverts commit 1fce343136c7744ea69f06226eaf058f379b9c4e. Closes-Bug: 1748836 Change-Id: Ib638b2a6e7be3dee2d7a7aa8fd4db0e45e7663b1 --- kuryr_kubernetes/controller/handlers/pipeline.py | 2 +- kuryr_kubernetes/handlers/asynchronous.py | 2 +- kuryr_kubernetes/handlers/k8s_base.py | 4 ++-- .../tests/unit/controller/handlers/test_pipeline.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 kuryr_kubernetes/handlers/asynchronous.py mode change 100644 => 100755 kuryr_kubernetes/handlers/k8s_base.py diff --git a/kuryr_kubernetes/controller/handlers/pipeline.py b/kuryr_kubernetes/controller/handlers/pipeline.py index d3507e8e9..3f0cd86d1 100644 --- a/kuryr_kubernetes/controller/handlers/pipeline.py +++ b/kuryr_kubernetes/controller/handlers/pipeline.py @@ -59,4 +59,4 @@ class ControllerPipeline(h_dis.EventPipeline): def _wrap_dispatcher(self, dispatcher): return h_log.LogExceptions(h_async.Async(dispatcher, self._tg, - h_k8s.object_link)) + h_k8s.object_uid)) diff --git a/kuryr_kubernetes/handlers/asynchronous.py b/kuryr_kubernetes/handlers/asynchronous.py old mode 100644 new mode 100755 index 2bfdc0330..599f522e6 --- a/kuryr_kubernetes/handlers/asynchronous.py +++ b/kuryr_kubernetes/handlers/asynchronous.py @@ -99,7 +99,7 @@ class Async(base.EventHandler): self._handler(event) def _done(self, thread, group): - LOG.debug("Asynchronous handler stopped processing %s", group) + LOG.debug("Asynchronous handler stopped processing group %s", group) queue = self._queues.pop(group) if not queue.empty(): diff --git a/kuryr_kubernetes/handlers/k8s_base.py b/kuryr_kubernetes/handlers/k8s_base.py old mode 100644 new mode 100755 index 5c66c897b..9312e1436 --- a/kuryr_kubernetes/handlers/k8s_base.py +++ b/kuryr_kubernetes/handlers/k8s_base.py @@ -24,9 +24,9 @@ def object_kind(event): return None -def object_link(event): +def object_uid(event): try: - return event['object']['metadata']['selfLink'] + return event['object']['metadata']['uid'] except KeyError: return None diff --git a/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py b/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py index e61ae8a4c..69d7c485f 100644 --- a/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py +++ b/kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py @@ -57,4 +57,4 @@ class TestControllerPipeline(test_base.TestCase): self.assertEqual(logging_handler, ret) m_logging_type.assert_called_with(async_handler) m_async_type.assert_called_with(dispatcher, thread_group, - h_k8s.object_link) + h_k8s.object_uid)