issue #324: cleanup: filesystem-id field is not needed for filestore-…

…client executeaction, removed broken (and unneeded) json validation; fixed comments here and there, etc (#351)
ydb-platform · Feb 6, 2024 · 885e799 · 885e799
1 parent 6105a56
commit 885e799
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/cloud/filestore/apps/client/lib/execute_action.cpp b/cloud/filestore/apps/client/lib/execute_action.cpp
@@ -15,7 +15,7 @@ TString ReadFile(const TString& path)
 }
 
 class TExecuteActionCommand final
-    : public TFileStoreCommand
+    : public TFileStoreServiceCommand
 {
 private:
     TString Action;
@@ -51,10 +51,6 @@ class TExecuteActionCommand final
 
         auto& input = Input.Empty() ? Cin : inputBytes;
         auto inputJsonStr = input.ReadAll();
-        if (NJson::ValidateJson(inputJsonStr)) {
-            Cout << "Invalid input-json" << Endl;
-            return false;
-        }
 
         STORAGE_DEBUG("Reading ExecuteAction request");
         auto request = std::make_shared<NProto::TExecuteActionRequest>();
@@ -71,7 +67,7 @@ class TExecuteActionCommand final
 
         if (HasError(result)) {
             Cout << FormatError(result.GetError()) << Endl;
-            return false;
+            return true;
         }
 
         Cout << result.GetOutput() << Endl;

diff --git a/cloud/filestore/config/storage.proto b/cloud/filestore/config/storage.proto
@@ -42,7 +42,7 @@ message TStorageConfig
     // flushing.
     optional uint32 FlushThreshold = 10;
 
-    // Backpressure thresholds.
+    // Thresholds for background ops.
     optional uint32 CleanupThreshold = 11;
     optional uint32 CompactionThreshold = 12;
     optional uint32 CollectGarbageThreshold = 13;

diff --git a/cloud/filestore/libs/storage/core/config.cpp b/cloud/filestore/libs/storage/core/config.cpp
@@ -224,17 +224,16 @@ void TStorageConfig::DumpHtml(IOutputStream& out) const
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void TStorageConfig::Merge(
-    const NProto::TStorageConfig& storageConfig)
+void TStorageConfig::Merge(const NProto::TStorageConfig& storageConfig)
 {
     ProtoConfig.MergeFrom(storageConfig);
 }
 
 TStorageConfig::TValueByName TStorageConfig::GetValueByName(
     const TString& name) const
 {
-    auto descriptor =
-        ProtoConfig.GetDescriptor()->FindFieldByName(name);
+    const auto* descriptor =
+        NProto::TStorageConfig::GetDescriptor()->FindFieldByName(name);
     using TStatus = TValueByName::ENameStatus;
 
     if (descriptor == nullptr) {

diff --git a/cloud/filestore/libs/storage/core/config.h b/cloud/filestore/libs/storage/core/config.h
@@ -45,7 +45,7 @@ class TStorageConfig
 
     TStorageConfig(const TStorageConfig&) = default;
 
-    void Merge(const NProto::TStorageConfig& storageServiceConfig);
+    void Merge(const NProto::TStorageConfig& storageConfig);
 
     TValueByName GetValueByName(const TString& name) const;
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_change_storage_config.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_change_storage_config.cpp
@@ -29,7 +29,7 @@ void TIndexTabletActor::ExecuteTx_ChangeStorageConfig(
 {
     TIndexTabletDatabase db(tx.DB);
     if (args.StorageConfigFromDB.Defined()) {
-        auto config = args.StorageConfigFromDB.Get();
+        auto* config = args.StorageConfigFromDB.Get();
         config->MergeFrom(args.StorageConfigNew);
         db.WriteStorageConfig(*config);
         args.ResultStorageConfig = std::move(*config);

diff --git a/cloud/filestore/private/api/protos/actions.proto b/cloud/filestore/private/api/protos/actions.proto
@@ -5,7 +5,7 @@ package NCloud.NFileStore.NProtoPrivate;
 option go_package = "github.com/ydb-platform/nbs/cloud/filestore/private/api/protos";
 
 ////////////////////////////////////////////////////////////////////////////////
-// Actiions
+// Actions
 
 message TDrainNodeRequest
 {