gh-2422 FederatedStore ChangeGraphId & ChangeGraphAccess recovery info.

gchq · Jul 19, 2021 · 1541f82 · 1541f82
1 parent 687c293
commit 1541f82
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/...ederated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java b/...ederated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java
@@ -555,10 +555,9 @@ private boolean changeGraphAccess(final String graphId, final FederatedAccess ne
                 try {
                     federatedStoreCache.addGraphToCache(graphToMove, newFederatedAccess, true/*true because graphLibrary should have throw error*/);
                 } catch (final CacheOperationException e) {
-                    //TODO FS recovery
-                    String s = "Error occurred updating graphAccess. GraphStorage=updated, Cache=outdated. graphId:" + graphId;
-                    LOGGER.error(s + " graphStorage access:{} cache access:{}", newFederatedAccess, oldAccess);
-                    throw new StorageException(s, e);
+                    String message = String.format("Error occurred updating graphAccess. GraphStorage=updated, Cache=outdated. graphId:%s. Recovery is possible from a restart if a persistent cache is being used, otherwise contact admin", graphId);
+                    LOGGER.error(message + " graphStorage access:{} cache access:{}", newFederatedAccess, oldAccess);
+                    throw new StorageException(message, e);
                 }
             }
 
@@ -606,10 +605,9 @@ private boolean changeGraphId(final String graphId, final String newGraphId, fin
                 try {
                     federatedStoreCache.addGraphToCache(newGraphSerialisable, key, true/*true because graphLibrary should have throw error*/);
                 } catch (final CacheOperationException e) {
-                    //TODO FS recovery
-                    String s = "Error occurred updating graphId. GraphStorage=updated, Cache=outdated graphId.";
-                    LOGGER.error(s + " graphStorage graphId:{} cache graphId:{}", newGraphId, graphId);
-                    throw new StorageException(s, e);
+                    String message = String.format("Error occurred updating graphId. GraphStorage=updated, Cache=outdated graphId. graphStorage graphId:%s cache graphId:%s. Recovery is possible from a restart if a persistent cache is being used, otherwise contact admin", newGraphId, graphId);
+                    LOGGER.error(message);
+                    throw new StorageException(message, e);
                 }
                 federatedStoreCache.deleteGraphFromCache(graphId);
             }