diff --git a/src/block_service/hdfs/hdfs_service.cpp b/src/block_service/hdfs/hdfs_service.cpp
index 9cf2ed8f12..9d1cdcc68c 100644
--- a/src/block_service/hdfs/hdfs_service.cpp
+++ b/src/block_service/hdfs/hdfs_service.cpp
@@ -56,14 +56,13 @@ hdfs_service::hdfs_service() { _read_token_bucket.reset(new folly::DynamicTokenB
 
 hdfs_service::~hdfs_service()
 {
-    ddebug("Try to disconnect hdfs.");
-    int result = hdfsDisconnect(_fs);
-    if (result == -1) {
-        derror_f("Fail to disconnect from the hdfs file system, error: {}.",
-                 utils::safe_strerror(errno));
-    }
-    // Even if there is an error, the resources associated with the hdfsFS will be freed.
-    _fs = nullptr;
+    // We should not call hdfsDisconnect() here if jvm has exited.
+    // And there is no simple, safe way to call hdfsDisconnect()
+    // when process terminates (the proper solution is likely to create a
+    // signal handler to detect when the process is killed, but we would still
+    // leak when pegasus crashes).
+    //
+    // close();
 }
 
 error_code hdfs_service::initialize(const std::vector<std::string> &args)
@@ -95,6 +94,21 @@ error_code hdfs_service::create_fs()
     return ERR_OK;
 }
 
+void hdfs_service::close()
+{
+    // This method should be carefully called.
+    // Calls to hdfsDisconnect() by individual threads would terminate
+    // all other connections handed out via hdfsConnect() to the same URI.
+    ddebug("Try to disconnect hdfs.");
+    int result = hdfsDisconnect(_fs);
+    if (result == -1) {
+        derror_f("Fail to disconnect from the hdfs file system, error: {}.",
+                 utils::safe_strerror(errno));
+    }
+    // Even if there is an error, the resources associated with the hdfsFS will be freed.
+    _fs = nullptr;
+}
+
 std::string hdfs_service::get_hdfs_entry_name(const std::string &hdfs_path)
 {
     // get exact file name from an hdfs path.
diff --git a/src/block_service/hdfs/hdfs_service.h b/src/block_service/hdfs/hdfs_service.h
index 0ded4f7d46..81eb05ff9c 100644
--- a/src/block_service/hdfs/hdfs_service.h
+++ b/src/block_service/hdfs/hdfs_service.h
@@ -52,6 +52,7 @@ class hdfs_service : public block_filesystem
                               dsn::task_code code,
                               const remove_path_callback &cb,
                               dsn::task_tracker *tracker) override;
+    void close();
 
     static std::string get_hdfs_entry_name(const std::string &hdfs_path);