Revert commits to use UID instead of SelfLink

Revert "Remove object_uid"
This reverts commit 17588f803f.
Revert "Improve pipeline/Async logging"
This reverts commit 1fce343136.

Closes-Bug: 1748836
Change-Id: Ib638b2a6e7be3dee2d7a7aa8fd4db0e45e7663b1
(cherry picked from commit 60213747a3)
This commit is contained in:
Eunsoo Park 2018-02-19 16:57:15 +09:00 committed by Luis Tomas Bolivar
parent 2aaffdf0a7
commit ae04fb9526
4 changed files with 5 additions and 5 deletions

View File

@ -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))

2
kuryr_kubernetes/handlers/asynchronous.py Normal file → Executable file
View File

@ -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():

4
kuryr_kubernetes/handlers/k8s_base.py Normal file → Executable file
View File

@ -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

View File

@ -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)