Merge pull request #597 from jkryl/hot-restart

cache: skip callback upon restart if object did not change

Author: k8s-ci-robot

src/cache.ts

@@ -197,9 +197,11 @@ export function addOrUpdateObject<T extends KubernetesObject>(
             addCallback.forEach((elt: ObjectCallback<T>) => elt(obj));
         }
     } else {
-        objects[ix] = obj;
-        if (updateCallback) {
-            updateCallback.forEach((elt: ObjectCallback<T>) => elt(obj));
+        if (!isSameVersion(objects[ix], obj)) {
+            objects[ix] = obj;
+            if (updateCallback) {
+                updateCallback.forEach((elt: ObjectCallback<T>) => elt(obj));
+            }
         }
     }
 }
@@ -208,6 +210,14 @@ function isSameObject<T extends KubernetesObject>(o1: T, o2: T): boolean {
     return o1.metadata!.name === o2.metadata!.name && o1.metadata!.namespace === o2.metadata!.namespace;
 }
 
+function isSameVersion<T extends KubernetesObject>(o1: T, o2: T): boolean {
+    return (
+        o1.metadata!.resourceVersion !== undefined &&
+        o1.metadata!.resourceVersion !== null &&
+        o1.metadata!.resourceVersion === o2.metadata!.resourceVersion
+    );
+}
+
 function findKubernetesObject<T extends KubernetesObject>(objects: T[], obj: T): number {
     return objects.findIndex((elt: T) => {
         return isSameObject(elt, obj);

src/cache_test.ts

@@ -330,11 +330,13 @@ describe('ListWatchCache', () => {
             {
                 metadata: {
                     name: 'name1',
+                    resourceVersion: '9876',
                 } as V1ObjectMeta,
             } as V1Namespace,
             {
                 metadata: {
                     name: 'name2',
+                    resourceVersion: '8765',
                 } as V1ObjectMeta,
             } as V1Namespace,
         ];
@@ -387,7 +389,7 @@ describe('ListWatchCache', () => {
         doneHandler(null);
         await promise;
         expect(addObjects).to.deep.equal(list);
-        expect(updateObjects).to.deep.equal(list);
+        expect(updateObjects).to.deep.equal([]);
     });
 
     it('should perform work as an informer with initial list and delete after', async () => {
@@ -396,18 +398,21 @@ describe('ListWatchCache', () => {
             {
                 metadata: {
                     name: 'name1',
+                    resourceVersion: '9876',
                 } as V1ObjectMeta,
             } as V1Namespace,
             {
                 metadata: {
                     name: 'name2',
+                    resourceVersion: '8765',
                 } as V1ObjectMeta,
             } as V1Namespace,
         ];
         const list2: V1Namespace[] = [
             {
                 metadata: {
                     name: 'name1',
+                    resourceVersion: '9999',
                 } as V1ObjectMeta,
             } as V1Namespace,
         ];
@@ -467,6 +472,7 @@ describe('ListWatchCache', () => {
             {
                 metadata: {
                     name: 'name2',
+                    resourceVersion: '8765',
                 } as V1ObjectMeta,
             } as V1Namespace,
         ]);