From d9e7fc124525d3e477fd0ce41b3867a73ae6e05a Mon Sep 17 00:00:00 2001 From: Dennis Zhou Date: Tue, 6 Sep 2022 11:00:06 -0700 Subject: [PATCH] ApiVersion: fix TraceFile apiversion check --- fdbclient/MultiVersionTransaction.actor.cpp | 2 +- flow/ApiVersion.h.cmake | 1 + flow/ApiVersions.cmake | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp index d4ebb2ca02..40dd9fbc0b 100644 --- a/fdbclient/MultiVersionTransaction.actor.cpp +++ b/fdbclient/MultiVersionTransaction.actor.cpp @@ -2579,7 +2579,7 @@ void MultiVersionApi::setupNetwork() { }); std::string baseTraceFileId; - if (apiVersion >= 630) { + if (apiVersion.hasTraceFileIdentifier()) { // TRACE_FILE_IDENTIFIER option is supported since 6.3 baseTraceFileId = traceFileIdentifier.empty() ? format("%d", getpid()) : traceFileIdentifier; } diff --git a/flow/ApiVersion.h.cmake b/flow/ApiVersion.h.cmake index 0783f5e588..54350c152a 100644 --- a/flow/ApiVersion.h.cmake +++ b/flow/ApiVersion.h.cmake @@ -64,6 +64,7 @@ public: // introduced features API_VERSION_FEATURE(@FDB_AV_SNAPSHOT_RYW@, SnapshotRYW); API_VERSION_FEATURE(@FDB_AV_INLINE_UPDATE_DATABASE@, InlineUpdateDatabase); API_VERSION_FEATURE(@FDB_AV_PERSISTENT_OPTIONS@, PersistentOptions); + API_VERSION_FEATURE(@FDB_AV_TRACE_FILE_IDENTIFIER@, TraceFileIdentifier); API_VERSION_FEATURE(@FDB_AV_CLUSTER_SHARED_STATE_MAP@, ClusterSharedStateMap); API_VERSION_FEATURE(@FDB_AV_TENANTS_V1@, TenantsV1); API_VERSION_FEATURE(@FDB_AV_BLOB_RANGE_API@, BlobRangeApi); diff --git a/flow/ApiVersions.cmake b/flow/ApiVersions.cmake index 16f1c33526..09236dace8 100644 --- a/flow/ApiVersions.cmake +++ b/flow/ApiVersions.cmake @@ -5,6 +5,7 @@ set(FDB_AV_LATEST_VERSION "720") set(FDB_AV_SNAPSHOT_RYW "300") set(FDB_AV_INLINE_UPDATE_DATABASE "610") set(FDB_AV_PERSISTENT_OPTIONS "610") +set(FDB_AV_TRACE_FILE_IDENTIFIER "630") set(FDB_AV_CLUSTER_SHARED_STATE_MAP "710") set(FDB_AV_TENANTS_V1 "720") set(FDB_AV_BLOB_RANGE_API "720")