nfs4: shutdown state handler on destroy

for graceful dcache shutdown Target: master, 2.10 Acked-By: Paul Millar Require-book: no Require-notes: no
dCache · Oct 14, 2014 · 55eb29f · 55eb29f
1 parent bc0e891
commit 55eb29f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/modules/dcache-nfs/src/main/java/org/dcache/chimera/nfsv41/door/NFSv41Door.java b/modules/dcache-nfs/src/main/java/org/dcache/chimera/nfsv41/door/NFSv41Door.java
@@ -304,6 +304,9 @@ public void init() throws Exception {
     public void destroy() throws IOException {
         _loginBrokerHandler.stop();
         _rpcService.stop();
+        if (_nfs4 != null) {
+            _nfs4.getStateHandler().shutdown();
+        }
         if(_proxyIoFactory != null) {
             _proxyIoFactory.cleanUp();
         }

diff --git a/modules/dcache-nfs/src/main/java/org/dcache/chimera/nfsv41/mover/NfsTransferService.java b/modules/dcache-nfs/src/main/java/org/dcache/chimera/nfsv41/mover/NfsTransferService.java
@@ -85,6 +85,7 @@ public void setPostTransferService(PostTransferService postTransferService) {
 
     public void shutdown() throws IOException {
         _nfsIO.shutdown();
+        _nfsIO.getNFSServer().getStateHandler().shutdown();
     }
 
     @Override