Cleanup before PR

HDFGroup · Aug 24, 2022 · d8ed4c2 · d8ed4c2
1 parent ec47df7
commit d8ed4c2
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 21 deletions.
diff --git a/adapter/test/stdio/CMakeLists.txt b/adapter/test/stdio/CMakeLists.txt
@@ -58,7 +58,7 @@ set_target_properties(hermes_stdio_low_buf_adapter_test PROPERTIES COMPILE_FLAGS
 gcc_hermes(hermes_stdio_low_buf_adapter_test "" "" hermes_small "")
 # TODO: The DPE doesn't respect available buffering space. In this test, it
 # gives out over 1 MiB of RAM even though the RAM tier only has ~756 KiB
-# available. See issue #TODO
+# available. See issue #439.
 # gcc_hermes(hermes_stdio_low_buf_adapter_test "" "" hermes_small async)
 
 add_executable(hermes_stdio_adapter_mode_test stdio_adapter_mode_test.cpp ${ADAPTER_COMMON})

diff --git a/benchmarks/borg_bench.cc b/benchmarks/borg_bench.cc
@@ -346,7 +346,6 @@ static void OptimizeReads(Options &options) {
     hapi::Bucket bkt(bkt_name, hermes, ctx);
 
     // MinIoTime with retry
-    // const int kReportFrequency = 30;
     hermes::testing::Timer put_timer;
     size_t failed_puts = 0;
     size_t retries = 0;

diff --git a/src/api/traits.cc b/src/api/traits.cc
@@ -141,15 +141,6 @@ void WriteOnlyTrait::onUnlink(HermesPtr hermes, TraitInput &input,
   (void)hermes;
   (void)input;
   (void)trait;
-
-#if 0
-  BucketID bucket_id = GetBucketId(&hermes->context_, &hermes->rpc_,
-                                   input.bucket_name.c_str());
-  BlobID blob_id = GetBlobId(&hermes->context_, &hermes->rpc_, input.blob_name,
-                             bucket_id, false);
-  MetadataManager *mdm = GetMetadataManagerFromContext(&hermes->context_);
-  WaitForOutstandingBlobOps(mdm, blob_id);
-#endif
 }
 
 }  // namespace api

diff --git a/src/buffer_organizer.cc b/src/buffer_organizer.cc
@@ -480,8 +480,6 @@ void LocalEnforceCapacityThresholds(SharedMemoryContext *context,
 
         std::sort(blob_ids.begin(), blob_ids.end(), compare_importance);
 
-        // TODO(chogan): Get enough buffer_ids to cover info.violation_size
-
         size_t bytes_moved = 0;
 
         for (size_t idx = 0;

diff --git a/src/metadata_management.cc b/src/metadata_management.cc
@@ -1049,7 +1049,6 @@ void UpdateGlobalSystemViewState(SharedMemoryContext *context,
   BufferPool *pool = GetBufferPoolFromContext(context);
 
   bool update_needed = false;
-  // TODO(chogan): BufferPool code should post adjustments via 1-sided rpc.
   std::vector<i64> adjustments(pool->num_devices);
   for (size_t i = 0; i < adjustments.size(); ++i) {
     adjustments[i] = pool->capacity_adjustments[i].exchange(0);
@@ -1215,7 +1214,6 @@ void InitMetadataManager(MetadataManager *mdm, RpcContext *rpc, Arena *arena,
 
   // Initialize Global SystemViewState
 
-  // TODO(chogan):
   if (node_id == 1) {
     // NOTE(chogan): Only Node 1 has the Global SystemViewState
     GlobalSystemViewState *global_state =

diff --git a/src/metadata_storage_stb_ds.cc b/src/metadata_storage_stb_ds.cc
@@ -660,14 +660,9 @@ bool LocalDestroyBucket(SharedMemoryContext *context, RpcContext *rpc,
       }
       ReleaseIdsPtr(mdm);
 
-      // NOTE(chogan): Holding the mdm->bucket_mutex while destroying Blobs can
-      // result in deadlock if the BORG is in the middle of moving a Blob's
-      // Buffers.
-      // EndTicketMutex(&mdm->bucket_mutex);
       for (auto blob_id : blobs_to_destroy) {
         DestroyBlobById(context, rpc, blob_id, bucket_id);
       }
-      // BeginTicketMutex(&mdm->bucket_mutex);
 
       // Delete BlobId list
       FreeIdList(mdm, info->blobs);

diff --git a/test/mdm_test.cc b/test/mdm_test.cc
@@ -392,7 +392,6 @@ static void TestEffectiveTarget() {
   HermesPtr hermes = hermes::InitHermesDaemon(&config);
 
   hermes::RoundRobinState rr_state;
-  // size_t num_devices = rr_state.GetNumDevices();
   rr_state.SetCurrentDeviceIndex(0);
 
   std::string bucket_name(__func__);