Merge pull request #2159 from DmitryLitvintsev/fix/2.11/8987

nfs: use noitify instead of blocking sendAndWait when sending pin/unpin messages via touch ".(get)(<file_name>)(pin)" command
dCache · Feb 5, 2016 · 07b8cb8 · 07b8cb8
2 parents 1970035 + 8074557
commit 07b8cb8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/modules/dcache-chimera/src/main/java/org/dcache/chimera/DCacheAwareJdbcFs.java b/modules/dcache-chimera/src/main/java/org/dcache/chimera/DCacheAwareJdbcFs.java
@@ -73,6 +73,8 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import diskCacheV111.vehicles.PoolManagerGetPoolMonitor;
 import diskCacheV111.vehicles.ProtocolInfo;
 
+import dmg.cells.nucleus.NoRouteToCellException;
+
 import org.dcache.acl.enums.AccessMask;
 import org.dcache.cells.CellStub;
 import org.dcache.namespace.FileAttribute;
@@ -138,8 +140,8 @@ public void pin(String pnfsid, long lifetime) throws ChimeraFsException {
             = new PinManagerPinMessage(attributes, protocolInfo, null, lifetime);
 
         try {
-            pinManagerStub.sendAndWait(message);
-        } catch (CacheException | InterruptedException t) {
+            pinManagerStub.notify(message);
+        } catch (NoRouteToCellException t) {
             throw new ChimeraFsException("pin", t);
         }
     }
@@ -154,8 +156,8 @@ public void unpin(String pnfsid) throws ChimeraFsException {
             = new PinManagerUnpinMessage(new PnfsId(pnfsid));
 
         try {
-            pinManagerStub.sendAndWait(message);
-        } catch (CacheException | InterruptedException t) {
+            pinManagerStub.notify(message);
+        } catch (NoRouteToCellException t) {
             throw new ChimeraFsException("unpin", t);
         }
     }