Meta server: do not declare inactivity timeout and close client's con…

…nection with pending ops, unless client isn't unloading / reading data. This change is primarily to fix fsck and possibly other similar "admin" RPCs that can take significant amount of time to execute.
quantcast · Mar 17, 2016 · 9f6b488 · 9f6b488
1 parent b89b54f
commit 9f6b488
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/cc/meta/ClientSM.cc b/src/cc/meta/ClientSM.cc
@@ -418,6 +418,12 @@ ClientSM::HandleRequestSelf(int code, void *data)
         }
         // Fall through.
     case EVENT_INACTIVITY_TIMEOUT:
+        if (EVENT_INACTIVITY_TIMEOUT == code && 0 < mPendingOpsCount &&
+                ! mNetConnection->IsWriteReady()) {
+            // Ops pending, do not close connection, unless the client
+            // isn't unloading / reading the data.
+            break;
+        }
         KFS_LOG_STREAM_DEBUG << PeerName(mNetConnection) <<
             " closing connection " <<
             (code == EVENT_INACTIVITY_TIMEOUT ?