GC unused age config

10 files changed, 8 insertions, 43 deletions

diff --git a/searchlib/src/tests/transactionlog/chunks_test.cpp b/searchlib/src/tests/transactionlog/chunks_test.cpp
index 692bde54727..4a74dd7f5bc 100644
--- a/searchlib/src/tests/transactionlog/chunks_test.cpp
+++ b/searchlib/src/tests/transactionlog/chunks_test.cpp
@@ -73,7 +73,6 @@ TEST("test serialization and deserialization of uncompressable zstd") {
 
 TEST("test empty commitchunk") {
     CommitChunk cc(1,1);
-    EXPECT_EQUAL(0ms, cc.age());
     EXPECT_EQUAL(0u, cc.sizeBytes());
     EXPECT_EQUAL(0u, cc.getNumCallBacks());
 }
@@ -93,7 +92,6 @@ TEST("test single element commitchunk") {
 
         cc.add(p, std::make_shared<Counter>(counter));
         EXPECT_EQUAL(1u, counter);
-        EXPECT_GREATER(cc.age(), 0ms);
         EXPECT_EQUAL(150u, cc.sizeBytes());
         EXPECT_EQUAL(1u, cc.getNumCallBacks());
     }
@@ -112,7 +110,6 @@ TEST("test multi element commitchunk") {
         p2.add(Packet::Entry(2, 2, ConstBufferRef(TEXT2, strlen(TEXT2))));
         cc.add(p2, std::make_shared<Counter>(counter));
         EXPECT_EQUAL(2u, counter);
-        EXPECT_GREATER(cc.age(), 0ms);
         EXPECT_EQUAL(180u, cc.sizeBytes());
         EXPECT_EQUAL(2u, cc.getNumCallBacks());
     }
diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp
index 80142f705c1..9e5021b4778 100644
--- a/searchlib/src/tests/transactionlog/translogclient_test.cpp
+++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp
@@ -623,8 +623,7 @@ TEST("test sending a lot of data") {
     const vespalib::string MANY("many");
     {
         DummyFileHeaderContext fileHeaderContext;
-        TransLogServer tlss("test8", 18377, ".", fileHeaderContext, DomainConfig().setPartSizeLimit(0x80000)
-                .setChunkAgeLimit(100us));
+        TransLogServer tlss("test8", 18377, ".", fileHeaderContext, DomainConfig().setPartSizeLimit(0x80000));
         TransLogClient tls("tcp/localhost:18377");
 
         createDomainTest(tls, MANY, 0);
@@ -696,8 +695,7 @@ TEST("test sending a lot of data async") {
     const vespalib::string MANY("many-async");
     {
         DummyFileHeaderContext fileHeaderContext;
-        TransLogServer tlss("test8", 18377, ".", fileHeaderContext, DomainConfig().setPartSizeLimit(0x80000)
-                .setChunkAgeLimit(10ms));
+        TransLogServer tlss("test8", 18377, ".", fileHeaderContext, DomainConfig().setPartSizeLimit(0x80000));
         TransLogClient tls("tcp/localhost:18377");
         createDomainTest(tls, MANY, 1);
         auto s1 = openDomainTest(tls, MANY);
diff --git a/searchlib/src/vespa/searchlib/transactionlog/common.cpp b/searchlib/src/vespa/searchlib/transactionlog/common.cpp
index fcd26c8fc36..556ebca06ec 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/common.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/common.cpp
@@ -123,8 +123,7 @@ Packet::add(const Packet::Entry & e)
 
 CommitChunk::CommitChunk(size_t reserveBytes, size_t reserveCount)
     : _data(reserveBytes),
-      _callBacks(),
-      _firstArrivalTime()
+      _callBacks()
 {
     _callBacks.reserve(reserveCount);
 }
@@ -133,19 +132,8 @@ CommitChunk::~CommitChunk() = default;
 
 void
 CommitChunk::add(const Packet &packet, Writer::DoneCallback onDone) {
-    if (_callBacks.empty()) {
-        _firstArrivalTime = vespalib::steady_clock::now();
-    }
     _data.merge(packet);
     _callBacks.emplace_back(std::move(onDone));
 }
 
-vespalib::duration
-CommitChunk::age() const {
-    if (_callBacks.empty()) {
-        return 0ms;
-    }
-    return (vespalib::steady_clock::now() - _firstArrivalTime);
-}
-
 }
diff --git a/searchlib/src/vespa/searchlib/transactionlog/common.h b/searchlib/src/vespa/searchlib/transactionlog/common.h
index 8bfa17cfcfb..7cdfad44b87 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/common.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/common.h
@@ -110,12 +110,10 @@ public:
     void add(const Packet & packet, Writer::DoneCallback onDone);
     size_t sizeBytes() const { return _data.sizeBytes(); }
     const Packet & getPacket() const { return _data; }
-    vespalib::duration age() const;
     size_t getNumCallBacks() const { return _callBacks.size(); }
 private:
     Packet                             _data;
     std::vector<Writer::DoneCallback>  _callBacks;
-    vespalib::steady_time              _firstArrivalTime;
 };
 
 }
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
index dcb287301c2..415ccafda70 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
@@ -343,8 +343,7 @@ Domain::erase(SerialNum to)
 }
 
 int
-Domain::visit(const Domain::SP & domain, SerialNum from, SerialNum to,
-              std::unique_ptr<Destination> dest)
+Domain::visit(const Domain::SP & domain, SerialNum from, SerialNum to, std::unique_ptr<Destination> dest)
 {
     assert(this == domain.get());
     cleanSessions();
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainconfig.cpp b/searchlib/src/vespa/searchlib/transactionlog/domainconfig.cpp
index beac8cf714b..93f5f910981 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainconfig.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainconfig.cpp
@@ -9,8 +9,7 @@ DomainConfig::DomainConfig()
       _compressionLevel(9),
       _fSyncOnCommit(false),
       _partSizeLimit(0x10000000), // 256M
-      _chunkSizeLimit(0x40000),   // 256k
-      _chunkAgeLimit(10ms)
+      _chunkSizeLimit(0x40000)   // 256k
 { }
 
 }
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainconfig.h b/searchlib/src/vespa/searchlib/transactionlog/domainconfig.h
index ada1e20e095..33b6a509d20 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainconfig.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainconfig.h
@@ -14,13 +14,11 @@ public:
     DomainConfig & setEncoding(Encoding v)          { _encoding = v; return *this; }
     DomainConfig & setPartSizeLimit(size_t v)       { _partSizeLimit = v; return *this; }
     DomainConfig & setChunkSizeLimit(size_t v)      { _chunkSizeLimit = v; return *this; }
-    DomainConfig & setChunkAgeLimit(vespalib::duration v) { _chunkAgeLimit = v; return *this; }
     DomainConfig & setCompressionLevel(uint8_t v)   { _compressionLevel = v; return *this; }
     DomainConfig & setFSyncOnCommit(bool v)         { _fSyncOnCommit = v; return *this; }
     Encoding          getEncoding() const { return _encoding; }
     size_t       getPartSizeLimit() const { return _partSizeLimit; }
     size_t      getChunkSizeLimit() const { return _chunkSizeLimit; }
-    duration     getChunkAgeLimit() const { return _chunkAgeLimit; }
     uint8_t   getCompressionlevel() const { return _compressionLevel; }
     bool         getFSyncOnCommit() const { return _fSyncOnCommit; }
 private:
@@ -29,7 +27,6 @@ private:
     bool         _fSyncOnCommit;
     size_t       _partSizeLimit;
     size_t       _chunkSizeLimit;
-    duration     _chunkAgeLimit;
 };
 
 struct PartInfo {
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index fcef06c3f2e..269ed7e9380 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -81,7 +81,7 @@ TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, con
                                const FileHeaderContext &fileHeaderContext)
     : TransLogServer(name, listenPort, baseDir, fileHeaderContext,
                      DomainConfig().setEncoding(Encoding(Encoding::xxh64, Encoding::Compression::none))
-                                        .setPartSizeLimit(0x10000000).setChunkSizeLimit(0x40000).setChunkAgeLimit( 100us))
+                                        .setPartSizeLimit(0x10000000).setChunkSizeLimit(0x40000))
 {}
 
 TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
@@ -203,13 +203,6 @@ TransLogServer::run()
     LOG(info, "TLS Stopped");
 }
 
-vespalib::duration
-TransLogServer::getChunkAgeLimit() const
-{
-    ReadGuard domainGuard(_domainMutex);
-    return _domainConfig.getChunkAgeLimit();
-}
-
 TransLogServer &
 TransLogServer::setDomainConfig(const DomainConfig & cfg) {
     WriteGuard domainGuard(_domainMutex);
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
index 77e38c90c9a..1c18d53e45c 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
@@ -32,10 +32,8 @@ public:
                    const common::FileHeaderContext &fileHeaderContext);
     ~TransLogServer() override;
     DomainStats getDomainStats() const;
-    bool commitIfStale();
     std::shared_ptr<Writer> getWriter(const vespalib::string & domainName) const override;
     TransLogServer & setDomainConfig(const DomainConfig & cfg);
-    vespalib::duration getChunkAgeLimit() const;
 
     class Session
     {
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
index 12c38ab5739..2ea37a7522b 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
@@ -66,7 +66,6 @@ getDomainConfig(const searchlib::TranslogserverConfig & cfg) {
         .setCompressionLevel(cfg.compression.level)
         .setPartSizeLimit(cfg.filesizemax)
         .setChunkSizeLimit(cfg.chunk.sizelimit)
-        .setChunkAgeLimit(vespalib::from_s(cfg.chunk.agelimit))
         .setFSyncOnCommit(cfg.usefsync);
     return dcfg;
 }
@@ -74,11 +73,10 @@ getDomainConfig(const searchlib::TranslogserverConfig & cfg) {
 void
 logReconfig(const searchlib::TranslogserverConfig & cfg, const DomainConfig & dcfg) {
     LOG(config, "configure Transaction Log Server %s at port %d\n"
-                "DomainConfig {encoding={%d, %d}, compression_level=%d, part_limit=%ld, chunk_limit=%ld age=%1.4f}",
+                "DomainConfig {encoding={%d, %d}, compression_level=%d, part_limit=%ld, chunk_limit=%ld}",
         cfg.servername.c_str(), cfg.listenport,
         dcfg.getEncoding().getCrc(), dcfg.getEncoding().getCompression(), dcfg.getCompressionlevel(),
-        dcfg.getPartSizeLimit(), dcfg.getChunkSizeLimit(), vespalib::to_s(dcfg.getChunkAgeLimit())
-    );
+        dcfg.getPartSizeLimit(), dcfg.getChunkSizeLimit());
 }
 
 }