From 8990891f8e908bd547843d73801cba8750b36c0c Mon Sep 17 00:00:00 2001 From: Markus Pilman Date: Mon, 10 Oct 2022 16:43:16 -0600 Subject: [PATCH] Fix restart failures from 7.1 --- fdbclient/include/fdbclient/CommitTransaction.h | 9 +++++++++ flow/ProtocolVersions.cmake | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fdbclient/include/fdbclient/CommitTransaction.h b/fdbclient/include/fdbclient/CommitTransaction.h index 520cb98505..2c7c62659b 100644 --- a/fdbclient/include/fdbclient/CommitTransaction.h +++ b/fdbclient/include/fdbclient/CommitTransaction.h @@ -296,6 +296,15 @@ struct CommitTransactionRef { } if (ar.protocolVersion().hasResolverPrivateMutations()) { serializer(ar, lock_aware); + if (!ar.protocolVersion().hasOTELSpanContext()) { + Optional context; + serializer(ar, context); + if (context.present()) { + SpanContext res; + res.traceID = context.get(); + spanContext = res; + } + } } if (ar.protocolVersion().hasOTELSpanContext()) { serializer(ar, spanContext); diff --git a/flow/ProtocolVersions.cmake b/flow/ProtocolVersions.cmake index 463466d26e..9ef5b3ff81 100644 --- a/flow/ProtocolVersions.cmake +++ b/flow/ProtocolVersions.cmake @@ -82,7 +82,7 @@ set(FDB_PV_STORAGE_METADATA "0x0FDB00B071010000LL") set(FDB_PV_PERPETUAL_WIGGLE_METADATA "0x0FDB00B071010000LL") set(FDB_PV_STORAGE_INTERFACE_READINESS "0x0FDB00B071010000LL") set(FDB_PV_TENANTS "0x0FDB00B071010000LL") -set(FDB_PV_RESOLVER_PRIVATE_MUTATIONS "0x0FDB00B072000000LL") +set(FDB_PV_RESOLVER_PRIVATE_MUTATIONS "0x0FDB00B071010000LL") set(FDB_PV_OTEL_SPAN_CONTEXT "0x0FDB00B072000000LL") set(FDB_PV_SW_VERSION_TRACKING "0x0FDB00B072000000LL") set(FDB_PV_ENCRYPTION_AT_REST "0x0FDB00B072000000LL")