Remove unnecessary close in HdfsLogger

Summary: unnecessary because HdfsLogger is not the owner of writable file. The
owner will close it on close or destruction.

env/env_hdfs.cc

@@ -11,10 +11,10 @@
 #ifndef ROCKSDB_HDFS_FILE_C
 #define ROCKSDB_HDFS_FILE_C
 
-#include <algorithm>
 #include <stdio.h>
 #include <sys/time.h>
 #include <time.h>
+#include <algorithm>
 #include <iostream>
 #include <sstream>
 #include "rocksdb/status.h"
@@ -253,7 +253,8 @@ class HdfsWritableFile: public WritableFile {
 
   // This is used by HdfsLogger to write data to the debug log file
   virtual Status Append(const char* src, size_t size) {
-    if (hdfsWrite(fileSys_, hfile_, src, static_cast<tSize>(size)) != static_cast<tSize>(size)) {
+    if (hdfsWrite(fileSys_, hfile_, src, static_cast<tSize>(size)) !=
+        static_cast<tSize>(size)) {
       return IOError(filename_, errno);
     }
     return Status::OK();
@@ -281,11 +282,11 @@ class HdfsLogger : public Logger {
   Status HdfsCloseHelper() {
     ROCKS_LOG_DEBUG(mylog, "[hdfs] HdfsLogger closed %s\n",
                     file_->getName().c_str());
-    Status s = file_->Close();
+    // Status s = file_->Close();
     if (mylog != nullptr && mylog == this) {
       mylog = nullptr;
     }
-    return s;
+    return Status::OK();
   }
 
  protected:
@@ -580,9 +581,7 @@ Status HdfsEnv::LockFile(const std::string& /*fname*/, FileLock** lock) {
   return Status::OK();
 }
 
-Status HdfsEnv::UnlockFile(FileLock* /*lock*/) {
-  return Status::OK();
-}
+Status HdfsEnv::UnlockFile(FileLock* /*lock*/) { return Status::OK(); }
 
 Status HdfsEnv::NewLogger(const std::string& fname,
                           std::shared_ptr<Logger>* result) {

hdfs/env_hdfs.h

@@ -67,7 +67,7 @@ class HdfsEnv : public Env {
                          const EnvOptions& options) override;
 
   Status NewDirectory(const std::string& name,
-                       std::unique_ptr<Directory>* result) override;
+                      std::unique_ptr<Directory>* result) override;
 
   Status FileExists(const std::string& fname) override;
 
@@ -85,11 +85,12 @@ class HdfsEnv : public Env {
   Status GetFileSize(const std::string& fname, uint64_t* size) override;
 
   Status GetFileModificationTime(const std::string& fname,
-                                         uint64_t* file_mtime) override;
+                                 uint64_t* file_mtime) override;
 
   Status RenameFile(const std::string& src, const std::string& target) override;
 
-  Status LinkFile(const std::string& /*src*/, const std::string& /*target*/) override {
+  Status LinkFile(const std::string& /*src*/,
+                  const std::string& /*target*/) override {
     return Status::NotSupported(); // not supported
   }
 
@@ -100,8 +101,9 @@ class HdfsEnv : public Env {
   Status NewLogger(const std::string& fname,
                    std::shared_ptr<Logger>* result) override;
 
-  void Schedule(void (*function)(void* arg), void* arg,
-                        Priority pri = LOW, void* tag = nullptr, void (*unschedFunction)(void* arg) = 0) override {
+  void Schedule(void (*function)(void* arg), void* arg, Priority pri = LOW,
+                void* tag = nullptr,
+                void (*unschedFunction)(void* arg) = 0) override {
     posixEnv->Schedule(function, arg, pri, tag, unschedFunction);
   }
 
@@ -115,18 +117,15 @@ class HdfsEnv : public Env {
 
   void WaitForJoin() override { posixEnv->WaitForJoin(); }
 
-  unsigned int GetThreadPoolQueueLen(Priority pri = LOW) const
-      override {
+  unsigned int GetThreadPoolQueueLen(Priority pri = LOW) const override {
     return posixEnv->GetThreadPoolQueueLen(pri);
   }
 
   Status GetTestDirectory(std::string* path) override {
     return posixEnv->GetTestDirectory(path);
   }
 
-  uint64_t NowMicros() override {
-    return posixEnv->NowMicros();
-  }
+  uint64_t NowMicros() override { return posixEnv->NowMicros(); }
 
   void SleepForMicroseconds(int micros) override {
     posixEnv->SleepForMicroseconds(micros);
@@ -141,7 +140,7 @@ class HdfsEnv : public Env {
   }
 
   Status GetAbsolutePath(const std::string& db_path,
-      std::string* output_path) override {
+                         std::string* output_path) override {
     return posixEnv->GetAbsolutePath(db_path, output_path);
   }
 
@@ -166,9 +165,7 @@ class HdfsEnv : public Env {
     return (uint64_t)pthread_self();
   }
 
-  uint64_t GetThreadID() const override {
-    return HdfsEnv::gettid();
-  }
+  uint64_t GetThreadID() const override { return HdfsEnv::gettid(); }
 
  private:
   std::string fsname_;  // string of the form "hdfs://hostname:port/"

tools/db_stress.cc

@@ -1407,7 +1407,8 @@ class StressTest {
       options.env = FLAGS_env;
       Status s = DestroyDB(FLAGS_db, options);
       if (!s.ok()) {
-        fprintf(stderr, "Cannot destroy original db: %s\n", s.ToString().c_str());
+        fprintf(stderr, "Cannot destroy original db: %s\n",
+                s.ToString().c_str());
         exit(1);
       }
     }