admin: Propagate NoRouteToCellException to pcells

In contrast to most places in dCache, pcells distinguishes between a timeout and a failure to send a message to a cell. Target: trunk Request: 2.12 Request: 2.11 Request: 2.10 Require-notes: no Require-book: no Acked-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Patch: https://rb.dcache.org/r/8014/ (cherry picked from commit b4aeea8)
dCache · Mar 30, 2015 · 6046451 · 6046451
1 parent c975871
commit 6046451
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/dcache/src/main/java/org/dcache/services/ssh2/PcellsCommand.java b/modules/dcache/src/main/java/org/dcache/services/ssh2/PcellsCommand.java
@@ -26,6 +26,7 @@
 import dmg.cells.applets.login.DomainObjectFrame;
 import dmg.cells.nucleus.CellEndpoint;
 import dmg.cells.nucleus.CellPath;
+import dmg.cells.nucleus.NoRouteToCellException;
 import dmg.util.CommandException;
 
 import org.dcache.cells.CellStub;
@@ -139,7 +140,11 @@ public void run()
                             } catch (IOException ignored) {
                             }
                         } catch (TimeoutCacheException e) {
-                            result = null;
+                            if (e.getCause() instanceof NoRouteToCellException) {
+                                result = e.getCause();
+                            } else {
+                                result = null;
+                            }
                         } catch (Exception ae) {
                             result = ae;
                         }