Retry queries when exception is StorageException.Unaavailable

Change-Id: I50537e18f09352ca35d039a341d6873f0ed44695
(cherry picked from commit 21a7149c)

@@ -55,7 +55,8 @@ public class OnosCopycatClient extends DelegatingCopycatClient {
             || e instanceof ClosedChannelException
             || e instanceof ClosedChannelException
             || e instanceof QueryException
             || e instanceof QueryException
             || e instanceof UnknownSessionException
             || e instanceof UnknownSessionException
-            || e instanceof ClosedSessionException;
+            || e instanceof ClosedSessionException
+            || e instanceof StorageException.Unavailable;
 
 
     OnosCopycatClient(CopycatClient client, int maxRetries, long delayBetweenRetriesMillis) {
     OnosCopycatClient(CopycatClient client, int maxRetries, long delayBetweenRetriesMillis) {
         super(client);
         super(client);

@@ -225,6 +225,6 @@ public class StoragePartitionClient implements DistributedPrimitiveCreator, Mana
                 throw new ResourceManagerException(e);
                 throw new ResourceManagerException(e);
             }
             }
         }
         }
-        return new ResourceClient(new OnosCopycatClient(copycatClient, 2, 100));
+        return new ResourceClient(new OnosCopycatClient(copycatClient, 5, 100));
     }
     }
 }
 }