Remove useFync argument.

Do not use default values in argumentlist.

8 files changed, 36 insertions, 70 deletions

diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp
index 74b0761320f..efd3b70858a 100644
--- a/searchlib/src/tests/transactionlog/translogclient_test.cpp
+++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp
@@ -532,7 +532,7 @@ bool Test::test1()
 void Test::createAndFillDomain(const vespalib::string & name, DomainPart::Crc crcMethod, size_t preExistingDomains)
 {
     DummyFileHeaderContext fileHeaderContext;
-    TransLogServer tlss("test13", 18377, ".", fileHeaderContext, 0x10000, false, 4, crcMethod);
+    TransLogServer tlss("test13", 18377, ".", fileHeaderContext, 0x10000, 4, crcMethod);
     TransLogClient tls("tcp/localhost:18377");
 
     createDomainTest(tls, name, preExistingDomains);
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
index d5c9fa5afcb..db21b0244cc 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
@@ -22,12 +22,11 @@ using std::runtime_error;
 namespace search::transactionlog {
 
 Domain::Domain(const string &domainName, const string & baseDir,
-               vespalib::ThreadExecutor & sessionExecutor, uint64_t domainPartSize, bool useFsync,
+               vespalib::ThreadExecutor & sessionExecutor, uint64_t domainPartSize,
                DomainPart::Crc defaultCrcType, const FileHeaderContext &fileHeaderContext) :
     _defaultCrcType(defaultCrcType),
     _sessionExecutor(sessionExecutor),
     _sessionId(1),
-    _useFsync(useFsync),
     _syncMonitor(),
     _pendingSync(false),
     _name(domainName),
@@ -56,12 +55,12 @@ Domain::Domain(const string &domainName, const string & baseDir,
     }
     _sessionExecutor.sync();
     if (_parts.empty() || _parts.crbegin()->second->isClosed()) {
-        _parts[lastPart].reset(new DomainPart(_name, dir(), lastPart, _useFsync, _defaultCrcType, _fileHeaderContext, false));
+        _parts[lastPart].reset(new DomainPart(_name, dir(), lastPart, _defaultCrcType, _fileHeaderContext, false));
     }
 }
 
 void Domain::addPart(int64_t partId, bool isLastPart) {
-    DomainPart::SP dp(new DomainPart(_name, dir(), partId, _useFsync, _defaultCrcType, _fileHeaderContext, isLastPart));
+    DomainPart::SP dp(new DomainPart(_name, dir(), partId, _defaultCrcType, _fileHeaderContext, isLastPart));
     if (dp->size() == 0) {
         // Only last domain part is allowed to be truncated down to
         // empty size.
@@ -277,7 +276,7 @@ void Domain::commit(const Packet & packet)
             }
         }
         dp->close();
-        dp.reset(new DomainPart(_name, dir(), entry.serial(), _useFsync, _defaultCrcType, _fileHeaderContext, false));
+        dp.reset(new DomainPart(_name, dir(), entry.serial(), _defaultCrcType, _fileHeaderContext, false));
         {
             LockGuard guard(_lock);
             _parts[entry.serial()] = dp;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.h b/searchlib/src/vespa/searchlib/transactionlog/domain.h
index 555744f3dac..f2172bf70ed 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.h
@@ -37,7 +37,7 @@ class Domain
 public:
     typedef std::shared_ptr<Domain> SP;
     Domain(const vespalib::string &name, const vespalib::string &baseDir,
-           vespalib::ThreadExecutor & sessionExecutor, uint64_t domainPartSize, bool useFsync,
+           vespalib::ThreadExecutor & sessionExecutor, uint64_t domainPartSize,
            DomainPart::Crc defaultCrcType, const common::FileHeaderContext &fileHeaderContext);
 
     virtual ~Domain();
@@ -94,7 +94,6 @@ private:
     DomainPart::Crc     _defaultCrcType;
     Executor          & _sessionExecutor;
     std::atomic<int>    _sessionId;
-    const bool          _useFsync;
     vespalib::Monitor   _syncMonitor;
     bool                _pendingSync;
     vespalib::string    _name;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
index ebe3c07c1df..35bdc71c963 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
@@ -265,15 +265,9 @@ DomainPart::buildPacketMapping(bool allowTruncate)
     return currPos;
 }
 
-DomainPart::DomainPart(const string & name,
-                       const string & baseDir,
-                       SerialNum s,
-                       bool useFsync,
-                       Crc defaultCrc,
-                       const FileHeaderContext &fileHeaderContext,
-                       bool allowTruncate) :
+DomainPart::DomainPart(const string & name, const string & baseDir, SerialNum s, Crc defaultCrc,
+                       const FileHeaderContext &fileHeaderContext, bool allowTruncate) :
     _defaultCrc(defaultCrc),
-    _useFsync(useFsync),
     _lock(),
     _fileLock(),
     _range(s),
@@ -428,9 +422,6 @@ DomainPart::commit(SerialNum firstSerial, const Packet &packet)
                                             entry.serial(), _range.to()));
         }
     }
-    if (_useFsync) {
-        sync();
-    }
 
     bool merged(false);
     LockGuard guard(_lock);
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.h b/searchlib/src/vespa/searchlib/transactionlog/domainpart.h
index 2af0a43d03c..59d0df6df94 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.h
@@ -24,13 +24,8 @@ public:
         xxh64=2
     };
     typedef std::shared_ptr<DomainPart> SP;
-    DomainPart(const vespalib::string &name,
-               const vespalib::string &baseDir,
-               SerialNum s,
-               bool useFsync,
-               Crc defaultCrc,
-               const common::FileHeaderContext &FileHeaderContext,
-               bool allowTruncate);
+    DomainPart(const vespalib::string &name, const vespalib::string &baseDir, SerialNum s, Crc defaultCrc,
+               const common::FileHeaderContext &FileHeaderContext, bool allowTruncate);
 
     ~DomainPart();
 
@@ -57,11 +52,7 @@ private:
     bool openAndFind(FastOS_FileInterface &file, const SerialNum &from);
     int64_t buildPacketMapping(bool allowTruncate);
 
-    static bool
-    read(FastOS_FileInterface &file,
-         Packet::Entry &entry,
-         vespalib::alloc::Alloc &buf,
-         bool allowTruncate);
+    static bool read(FastOS_FileInterface &file, Packet::Entry &entry, vespalib::alloc::Alloc &buf, bool allowTruncate);
 
     void write(FastOS_FileInterface &file, const Packet::Entry &entry);
     static int32_t calcCrc(Crc crc, const void * buf, size_t len);
@@ -70,11 +61,7 @@ private:
     class SkipInfo
     {
     public:
-        SkipInfo(SerialNum s, uint64_t p) :
-            _id(s),
-            _pos(p)
-        {
-        }
+        SkipInfo(SerialNum s, uint64_t p) : _id(s), _pos(p) {}
 
         bool operator ==(const SkipInfo &b) const { return cmp(b) == 0; }
         bool operator  <(const SkipInfo &b) const { return cmp(b) < 0; }
@@ -91,7 +78,6 @@ private:
     typedef std::vector<SkipInfo> SkipList;
     typedef std::map<SerialNum, Packet> PacketList;
     const Crc      _defaultCrc;
-    const bool     _useFsync;
     vespalib::Lock _lock;
     vespalib::Lock _fileLock;
     SerialNumRange _range;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index b273f5f092a..2e0a0414321 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -75,21 +75,23 @@ SyncHandler::PerformTask()
 
 }
 
-
-
-TransLogServer::TransLogServer(const vespalib::string &name,
-                               int listenPort,
-                               const vespalib::string &baseDir,
-                               const FileHeaderContext &fileHeaderContext,
-                               uint64_t domainPartSize,
-                               bool useFsync,
-                               size_t maxThreads,
-                               DomainPart::Crc defaultCrcType)
+TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
+                               const FileHeaderContext &fileHeaderContext)
+    : TransLogServer(name, listenPort, baseDir, fileHeaderContext, 0x10000000)
+{}
+
+TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
+                               const FileHeaderContext &fileHeaderContext, uint64_t domainPartSize)
+    : TransLogServer(name, listenPort, baseDir, fileHeaderContext, domainPartSize, 4, DomainPart::Crc::xxh64)
+{}
+
+TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
+                               const FileHeaderContext &fileHeaderContext, uint64_t domainPartSize,
+                               size_t maxThreads, DomainPart::Crc defaultCrcType)
     : FRT_Invokable(),
       _name(name),
       _baseDir(baseDir),
       _domainPartSize(domainPartSize),
-      _useFsync(useFsync),
       _defaultCrcType(defaultCrcType),
       _sessionExecutor(maxThreads, 128*1024),
       _threadPool(8192, 1),
@@ -107,13 +109,8 @@ TransLogServer::TransLogServer(const vespalib::string &name,
                 domainDir >> domainName;
                 if ( ! domainName.empty()) {
                     try {
-                        Domain::SP domain(new Domain(domainName,
-                                dir(),
-                                _sessionExecutor,
-                                _domainPartSize,
-                                _useFsync,
-                                _defaultCrcType,
-                                _fileHeaderContext));
+                        auto domain = std::make_shared<Domain>(domainName, dir(), _sessionExecutor, _domainPartSize,
+                                                               _defaultCrcType,_fileHeaderContext);
                         _domains[domain->name()] = domain;
                     } catch (const std::exception & e) {
                         LOG(warning, "Failed creating %s domain on startup. Exception = %s", domainName.c_str(), e.what());
@@ -359,13 +356,8 @@ void TransLogServer::createDomain(FRT_RPCRequest *req)
     Domain::SP domain(findDomain(domainName));
     if ( !domain ) {
         try {
-            domain.reset(new Domain(domainName,
-                                dir(),
-                                _sessionExecutor,
-                                _domainPartSize,
-                                _useFsync,
-                                _defaultCrcType,
-                                _fileHeaderContext));
+            domain = std::make_shared<Domain>(domainName, dir(), _sessionExecutor, _domainPartSize,
+                                              _defaultCrcType, _fileHeaderContext);
             {
                 Guard domainGuard(_lock);
                 _domains[domain->name()] = domain;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
index d04fb4f56d1..225206dc0f5 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
@@ -21,13 +21,13 @@ public:
     typedef std::unique_ptr<TransLogServer> UP;
     typedef std::shared_ptr<TransLogServer> SP;
 
-    TransLogServer(const vespalib::string &name, int listenPort,
-                   const vespalib::string &baseDir,
+    TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
                    const common::FileHeaderContext &fileHeaderContext,
-                   uint64_t domainPartSize=0x10000000,
-                   bool useFsync=false,
-                   size_t maxThreads=4,
-                   DomainPart::Crc defaultCrc=DomainPart::xxh64);
+                   uint64_t domainPartSize, size_t maxThreads, DomainPart::Crc defaultCrc);
+    TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
+                   const common::FileHeaderContext &fileHeaderContext, uint64_t domainPartSize);
+    TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
+                   const common::FileHeaderContext &fileHeaderContext);
     virtual ~TransLogServer();
     DomainStats getDomainStats() const;
 
@@ -82,7 +82,6 @@ private:
     vespalib::string                    _name;
     vespalib::string                    _baseDir;
     const uint64_t                      _domainPartSize;
-    const bool                          _useFsync;
     const DomainPart::Crc               _defaultCrcType;
     vespalib::ThreadStackExecutor       _sessionExecutor;
     FastOS_ThreadPool                   _threadPool;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
index b84d7854457..ff4a402b438 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
@@ -40,7 +40,7 @@ void TransLogServerApp::start()
 {
     std::shared_ptr<searchlib::TranslogserverConfig> c = _tlsConfig.get();
     _tls.reset(new TransLogServer(c->servername, c->listenport, c->basedir, _fileHeaderContext,
-                                  c->filesizemax, c->usefsync, c->maxthreads, getCrc(c->crcmethod)));
+                                  c->filesizemax, c->maxthreads, getCrc(c->crcmethod)));
 }
 
 TransLogServerApp::~TransLogServerApp()