From b0f61fb74f037dd3d2effb998e8d9088ebbb8f34 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Fri, 15 Jan 2021 19:35:10 +0000 Subject: [PATCH] Resolve the simple-looking conflicts --- CMakeLists.txt | 4 --- fdbclient/BackupContainer.h | 6 +--- .../BackupContainerAzureBlobStore.actor.cpp | 2 ++ .../BackupContainerLocalDirectory.actor.cpp | 3 ++ .../BackupContainerS3BlobStore.actor.cpp | 3 ++ fdbclient/DatabaseConfiguration.h | 12 ------- fdbclient/NativeAPI.actor.cpp | 32 +++---------------- fdbclient/SystemData.h | 8 ++--- fdbserver/Knobs.cpp | 3 -- fdbserver/Knobs.h | 3 -- versions.target | 5 --- 11 files changed, 17 insertions(+), 64 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12b6083813..cd06f1cb71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,11 +18,7 @@ # limitations under the License. cmake_minimum_required(VERSION 3.13) project(foundationdb -<<<<<<< HEAD VERSION 7.0.0 -======= - VERSION 6.3.11 ->>>>>>> release-6.3 DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions." HOMEPAGE_URL "http://www.foundationdb.org/" LANGUAGES C CXX ASM) diff --git a/fdbclient/BackupContainer.h b/fdbclient/BackupContainer.h index 8ad69a1f0c..cbdfb5e824 100644 --- a/fdbclient/BackupContainer.h +++ b/fdbclient/BackupContainer.h @@ -40,11 +40,7 @@ Future timeKeeperVersionFromDatetime(std::string const &datetime, Datab // TODO: Move the log file and range file format encoding/decoding stuff to this file and behind interfaces. class IBackupFile { public: -<<<<<<< HEAD - IBackupFile(const std::string& fileName) : m_fileName(fileName), m_offset(0) {} -======= - IBackupFile(std::string fileName) : m_fileName(fileName) {} ->>>>>>> release-6.3 + IBackupFile(const std::string& fileName) : m_fileName(fileName) {} virtual ~IBackupFile() {} // Backup files are append-only and cannot have more than 1 append outstanding at once. virtual Future append(const void *data, int len) = 0; diff --git a/fdbclient/BackupContainerAzureBlobStore.actor.cpp b/fdbclient/BackupContainerAzureBlobStore.actor.cpp index 920c64ee17..b8e9a9214b 100644 --- a/fdbclient/BackupContainerAzureBlobStore.actor.cpp +++ b/fdbclient/BackupContainerAzureBlobStore.actor.cpp @@ -127,6 +127,7 @@ public: class BackupFile final : public IBackupFile, ReferenceCounted { Reference m_file; + int64_t m_offset; public: BackupFile(const std::string& fileName, Reference file) : IBackupFile(fileName), m_file(file) {} @@ -142,6 +143,7 @@ public: return Void(); }); } + int64_t size() const override { return m_offset; } void addref() override { ReferenceCounted::addref(); } void delref() override { ReferenceCounted::delref(); } }; diff --git a/fdbclient/BackupContainerLocalDirectory.actor.cpp b/fdbclient/BackupContainerLocalDirectory.actor.cpp index 7b5504b16c..388271d743 100644 --- a/fdbclient/BackupContainerLocalDirectory.actor.cpp +++ b/fdbclient/BackupContainerLocalDirectory.actor.cpp @@ -50,12 +50,15 @@ public: Future finish() { return finish_impl(Reference::addRef(this)); } + int64_t size() const override { return m_offset; } + void addref() override { return ReferenceCounted::addref(); } void delref() override { return ReferenceCounted::delref(); } private: Reference m_file; std::string m_finalFullPath; + int64_t m_offset; }; ACTOR static Future listFiles_impl(std::string path, std::string m_path) { diff --git a/fdbclient/BackupContainerS3BlobStore.actor.cpp b/fdbclient/BackupContainerS3BlobStore.actor.cpp index 4713d87d21..085e88caf6 100644 --- a/fdbclient/BackupContainerS3BlobStore.actor.cpp +++ b/fdbclient/BackupContainerS3BlobStore.actor.cpp @@ -61,11 +61,14 @@ public: }); } + int64_t size() const override { return m_offset; } + void addref() final { return ReferenceCounted::addref(); } void delref() final { return ReferenceCounted::delref(); } private: Reference m_file; + int64_t m_offset; }; ACTOR static Future listFiles( diff --git a/fdbclient/DatabaseConfiguration.h b/fdbclient/DatabaseConfiguration.h index f2dab9460f..2b1172a794 100644 --- a/fdbclient/DatabaseConfiguration.h +++ b/fdbclient/DatabaseConfiguration.h @@ -223,7 +223,6 @@ struct DatabaseConfiguration { bool isExcludedServer(NetworkAddressList) const; std::set getExcludedServers() const; -<<<<<<< HEAD int32_t getDesiredCommitProxies() const { if (commitProxyCount == -1) return autoCommitProxyCount; return commitProxyCount; @@ -232,15 +231,6 @@ struct DatabaseConfiguration { if (grvProxyCount == -1) return autoGrvProxyCount; return grvProxyCount; } - int32_t getDesiredResolvers() const { if(resolverCount == -1) return autoResolverCount; return resolverCount; } - int32_t getDesiredLogs() const { if(desiredTLogCount == -1) return autoDesiredTLogCount; return desiredTLogCount; } - int32_t getDesiredRemoteLogs() const { if(remoteDesiredTLogCount == -1) return getDesiredLogs(); return remoteDesiredTLogCount; } - int32_t getDesiredSatelliteLogs( Optional dcId ) const { -======= - int32_t getDesiredProxies() const { - if (masterProxyCount == -1) return autoMasterProxyCount; - return masterProxyCount; - } int32_t getDesiredResolvers() const { if (resolverCount == -1) return autoResolverCount; return resolverCount; @@ -254,8 +244,6 @@ struct DatabaseConfiguration { return remoteDesiredTLogCount; } int32_t getDesiredSatelliteLogs(Optional dcId) const { - ->>>>>>> release-6.3 auto desired = getRegion(dcId).satelliteDesiredTLogCount; if (desired == -1) return autoDesiredTLogCount; return desired; diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp index d4fa581bab..bb067f3131 100644 --- a/fdbclient/NativeAPI.actor.cpp +++ b/fdbclient/NativeAPI.actor.cpp @@ -846,11 +846,7 @@ DatabaseContext::DatabaseContext(Reference>>>>>> release-6.3 transactionReadVersions("ReadVersions", cc), transactionReadVersionsThrottled("ReadVersionsThrottled", cc), transactionReadVersionsCompleted("ReadVersionsCompleted", cc), transactionReadVersionBatches("ReadVersionBatches", cc), @@ -872,24 +868,14 @@ DatabaseContext::DatabaseContext(ReferenceSHARD_STAT_SMOOTH_AMOUNT), - transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc), -======= transactionStatusRequests("StatusRequests", cc), transactionsTooOld("TooOld", cc), transactionsFutureVersions("FutureVersions", cc), transactionsNotCommitted("NotCommitted", cc), transactionsMaybeCommitted("MaybeCommitted", cc), transactionsResourceConstrained("ResourceConstrained", cc), transactionsThrottled("Throttled", cc), transactionsProcessBehind("ProcessBehind", cc), outstandingWatches(0), latencies(1000), readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), mvCacheInsertLocation(0), healthMetricsLastUpdated(0), detailedHealthMetricsLastUpdated(0), - internal(internal), ->>>>>>> release-6.3 + internal(internal), transactionTracingEnabled(true), smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT), + transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc), specialKeySpace(std::make_unique(specialKeys.begin, specialKeys.end, /* test */ false)) { dbId = deterministicRandom()->randomUniqueID(); connected = (clientInfo->get().commitProxies.size() && clientInfo->get().grvProxies.size()) @@ -1057,22 +1043,14 @@ DatabaseContext::DatabaseContext(const Error& err) transactionsCommitStarted("CommitStarted", cc), transactionsCommitCompleted("CommitCompleted", cc), transactionKeyServerLocationRequests("KeyServerLocationRequests", cc), transactionKeyServerLocationRequestsCompleted("KeyServerLocationRequestsCompleted", cc), -<<<<<<< HEAD - transactionsTooOld("TooOld", cc), transactionsFutureVersions("FutureVersions", cc), - transactionsNotCommitted("NotCommitted", cc), transactionsMaybeCommitted("MaybeCommitted", cc), - transactionsResourceConstrained("ResourceConstrained", cc), transactionsThrottled("Throttled", cc), - transactionsProcessBehind("ProcessBehind", cc), latencies(1000), readLatencies(1000), commitLatencies(1000), - GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), - smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT), - transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc), internal(false), transactionTracingEnabled(true) {} -======= transactionStatusRequests("StatusRequests", cc), transactionsTooOld("TooOld", cc), transactionsFutureVersions("FutureVersions", cc), transactionsNotCommitted("NotCommitted", cc), transactionsMaybeCommitted("MaybeCommitted", cc), transactionsResourceConstrained("ResourceConstrained", cc), transactionsThrottled("Throttled", cc), transactionsProcessBehind("ProcessBehind", cc), latencies(1000), readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), - internal(false) {} ->>>>>>> release-6.3 + smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT), + transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc), internal(false), + transactionTracingEnabled(true) {} Database DatabaseContext::create(Reference> clientInfo, Future clientInfoMonitor, LocalityData clientLocality, bool enableLocalityLoadBalance, TaskPriority taskID, bool lockAware, int apiVersion, bool switchable) { return Database( new DatabaseContext( Reference>>(), clientInfo, clientInfoMonitor, taskID, clientLocality, enableLocalityLoadBalance, lockAware, true, apiVersion, switchable ) ); diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h index a77814950a..4a5c5c5a19 100644 --- a/fdbclient/SystemData.h +++ b/fdbclient/SystemData.h @@ -194,13 +194,11 @@ UID decodeProcessClassKeyOld( KeyRef const& key ); extern const KeyRangeRef configKeys; extern const KeyRef configKeysPrefix; -<<<<<<< HEAD -// The differences between excluded and failed can be found in "command-line-interface.rst" -// and in the help message of the fdbcli command "exclude". -======= // Change the value of this key to anything and that will trigger detailed data distribution team info log. extern const KeyRef triggerDDTeamInfoPrintKey; ->>>>>>> release-6.3 + +// The differences between excluded and failed can be found in "command-line-interface.rst" +// and in the help message of the fdbcli command "exclude". // "\xff/conf/excluded/1.2.3.4" := "" // "\xff/conf/excluded/1.2.3.4:4000" := "" diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp index f6b6a5b4f6..ec6a0dfe70 100644 --- a/fdbserver/Knobs.cpp +++ b/fdbserver/Knobs.cpp @@ -380,11 +380,8 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi init( PROXY_COMPUTE_BUCKETS, 20000 ); init( PROXY_COMPUTE_GROWTH_RATE, 0.01 ); init( TXN_STATE_SEND_AMOUNT, 4 ); -<<<<<<< HEAD init( REPORT_TRANSACTION_COST_ESTIMATION_DELAY, 0.1 ); -======= init( PROXY_REJECT_BATCH_QUEUED_TOO_LONG, true ); ->>>>>>> release-6.3 init( RESET_MASTER_BATCHES, 200 ); init( RESET_RESOLVER_BATCHES, 200 ); diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h index b3cd980af0..51567f6fee 100644 --- a/fdbserver/Knobs.h +++ b/fdbserver/Knobs.h @@ -311,11 +311,8 @@ public: int PROXY_COMPUTE_BUCKETS; double PROXY_COMPUTE_GROWTH_RATE; int TXN_STATE_SEND_AMOUNT; -<<<<<<< HEAD double REPORT_TRANSACTION_COST_ESTIMATION_DELAY; -======= bool PROXY_REJECT_BATCH_QUEUED_TOO_LONG; ->>>>>>> release-6.3 int RESET_MASTER_BATCHES; int RESET_RESOLVER_BATCHES; diff --git a/versions.target b/versions.target index e817a2b325..1b42c29961 100644 --- a/versions.target +++ b/versions.target @@ -1,12 +1,7 @@ -<<<<<<< HEAD 7.0.0 7.0 -======= - 6.3.11 - 6.3 ->>>>>>> release-6.3