Merge pull request #564 from jwforres/fix-isi-cache-bust

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/services/data.js

@@ -87,6 +87,10 @@ angular.module('openshiftConsole')
       // 25 is a reasonable number to keep at least one or two projects worth of data in cache
       number: 25
     });
+    this._immutableDataCache = $cacheFactory('immutableDataCache', {
+      // 50 is a reasonable number for the immutable resources that are stored per resource instead of grouped by type
+      number: 50
+    });
     this._watchOptionsMap = {};
     this._watchWebsocketsMap = {};
     this._watchPollTimeoutsMap = {};
@@ -329,13 +333,13 @@ angular.module('openshiftConsole')
 
     var deferred = $q.defer();
 
-    var existingData = this._data(key);
+    var existingImmutableData = this._immutableData(key);
 
     // special case, if we have an immutable item, we can return it immediately
-    if (this._hasImmutable(resource, existingData, name)) {
+    if (this._hasImmutable(resource, existingImmutableData, name)) {
       $timeout(function() {
         // we can be guaranteed this wont change on us, just send what we have in existingData
-        deferred.resolve(existingData.by('metadata.name')[name]);
+        deferred.resolve(existingImmutableData.by('metadata.name')[name]);
       }, 0);
     }
     else {
@@ -348,11 +352,11 @@ angular.module('openshiftConsole')
         }, opts.http || {}))
         .success(function(data, status, headerFunc, config, statusText) {
           if (self._isImmutable(resource)) {
-            if (!existingData) {
-              self._data(key, [data]);
+            if (!existingImmutableData) {
+              self._immutableData(key, [data]);
             }
             else {
-              existingData.update(data, "ADDED");
+              existingImmutableData.update(data, "ADDED");
             }
           }
           deferred.resolve(data);
@@ -650,7 +654,7 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
     var key = this._uniqueKey(resource, null, context, _.get(opts, 'http.params'));
 
     if (objectCallback && objectName) {
-      var objectKey = this._uniqueKey(resource, objectName, context, _.get(opts, 'http.params'));      
+      var objectKey = this._uniqueKey(resource, objectName, context, _.get(opts, 'http.params'));
       var objCallbacks = this._watchObjectCallbacks(objectKey);
       objCallbacks.remove(objectCallback);
     }
@@ -740,6 +744,13 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
            this._dataCache.get(key);
   };
 
+    // uses $cacheFactory to impl LRU cache
+  DataService.prototype._immutableData = function(key, data) {
+    return data ?
+           this._immutableDataCache.put(key, new Data(data)) :
+           this._immutableDataCache.get(key);
+  };
+
   DataService.prototype._isCached = function(key) {
     return this._watchInFlight(key) &&
            this._resourceVersion(key) &&

dist/scripts/scripts.js

@@ -888,6 +888,8 @@ c[h] || (c[h] = {}), "DELETED" === d ? delete c[h][i] :c[h][i] = a;
 function m() {
 this._listCallbacksMap = {}, this._watchCallbacksMap = {}, this._watchObjectCallbacksMap = {}, this._watchOperationMap = {}, this._listOperationMap = {}, this._resourceVersionMap = {}, this._dataCache = a("dataCache", {
 number:25
+}), this._immutableDataCache = a("immutableDataCache", {
+number:50
 }), this._watchOptionsMap = {}, this._watchWebsocketsMap = {}, this._watchPollTimeoutsMap = {}, this._websocketEventsMap = {};
 var b = this;
 d.$on("$routeChangeStart", function(a, c, d) {
@@ -1040,7 +1042,7 @@ a = g.toResourceGroupVersion(a), f = f || {};
 var i = this._uniqueKey(a, c, d, _.get(f, "http.params"));
 !!f.force;
 delete f.force;
-var k = e.defer(), l = this._data(i);
+var k = e.defer(), l = this._immutableData(i);
 if (this._hasImmutable(a, l, c)) j(function() {
 k.resolve(l.by("metadata.name")[c]);
 }, 0); else {
@@ -1051,7 +1053,7 @@ method:"GET",
 auth:{},
 url:m._urlForResource(a, c, d, !1, e)
 }, f.http || {})).success(function(b, c, d, e, f) {
-m._isImmutable(a) && (l ? l.update(b, "ADDED") :m._data(i, [ b ])), k.resolve(b);
+m._isImmutable(a) && (l ? l.update(b, "ADDED") :m._immutableData(i, [ b ])), k.resolve(b);
 }).error(function(b, d, e, g) {
 if (f.errorNotification !== !1) {
 var i = "Failed to get " + a + "/" + c;
@@ -1212,6 +1214,8 @@ return b || b === !1 ? void (this._listOperationMap[a] = b) :this._listOperation
 return b ? void (this._resourceVersionMap[a] = b) :this._resourceVersionMap[a];
 }, m.prototype._data = function(a, b) {
 return b ? this._dataCache.put(a, new k(b)) :this._dataCache.get(a);
+}, m.prototype._immutableData = function(a, b) {
+return b ? this._immutableDataCache.put(a, new k(b)) :this._immutableDataCache.get(a);
 }, m.prototype._isCached = function(a) {
 return this._watchInFlight(a) && this._resourceVersion(a) && !!this._data(a);
 }, m.prototype._watchOptions = function(a, b) {