No need to have this memory trap enabled anymore.

3 files changed, 2 insertions, 13 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 777b9a93be6..fce5205fafc 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -78,10 +78,6 @@ FileStorManager(const config::ConfigUri & configUri, spi::PersistenceProvider& p
       _configFetcher(std::make_unique<config::ConfigFetcher>(configUri.getContext())),
       _use_async_message_handling_on_schedule(false),
       _metrics(std::make_unique<FileStorMetrics>()),
-      _mem_trap_1(std::make_unique<vespalib::HeapMemoryTrap>(1)),
-      _mem_trap_2(std::make_unique<vespalib::HeapMemoryTrap>(2)),
-      _mem_trap_3(std::make_unique<vespalib::HeapMemoryTrap>(3)),
-      _mem_trap_4(std::make_unique<vespalib::HeapMemoryTrap>(16)),
       _filestorHandler(),
       _sequencedExecutor(),
       _closed(false),
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h
index cf004c58820..787e52dcc8c 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h
@@ -20,10 +20,11 @@
 #include <vespa/storage/common/storagelinkqueued.h>
 #include <vespa/config-stor-filestor.h>
 #include <vespa/storage/persistence/diskthread.h>
+
 #include <vespa/storage/common/nodestateupdater.h>
 #include <vespa/storageframework/generic/status/htmlstatusreporter.h>
+
 #include <vespa/config/helper/ifetchercallback.h>
-#include <vespa/vespalib/util/memory_trap.h>
 
 namespace config {
     class ConfigUri;
@@ -71,11 +72,6 @@ class FileStorManager : public StorageLinkQueued,
     std::unique_ptr<config::ConfigFetcher> _configFetcher;
     bool                  _use_async_message_handling_on_schedule;
     std::shared_ptr<FileStorMetrics> _metrics;
-    // Spray&pray over a few different size classes
-    std::unique_ptr<vespalib::HeapMemoryTrap> _mem_trap_1;
-    std::unique_ptr<vespalib::HeapMemoryTrap> _mem_trap_2;
-    std::unique_ptr<vespalib::HeapMemoryTrap> _mem_trap_3;
-    std::unique_ptr<vespalib::HeapMemoryTrap> _mem_trap_4;
     std::unique_ptr<FileStorHandler> _filestorHandler;
     std::unique_ptr<vespalib::ISequencedTaskExecutor> _sequencedExecutor;
 
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
index f7217692a49..9a01cab8dd5 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
@@ -14,7 +14,6 @@
 #include "active_operations_metrics.h"
 #include <vespa/metrics/metricset.h>
 #include <vespa/metrics/summetric.h>
-#include <vespa/vespalib/util/memory_trap.h>
 
 namespace storage {
 
@@ -117,11 +116,9 @@ struct FileStorThreadMetrics : public metrics::MetricSet
     Op mergeBuckets;
     Op getBucketDiff;
     Op applyBucketDiff;
-    vespalib::InlineMemoryTrap<1> mem_trap_1;
     metrics::LongCountMetric getBucketDiffReply;
     metrics::LongCountMetric applyBucketDiffReply;
     MergeHandlerMetrics merge_handler_metrics;
-    vespalib::InlineMemoryTrap<1> mem_trap_2;
 
     FileStorThreadMetrics(const std::string& name, const std::string& desc);
     ~FileStorThreadMetrics() override;