wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix restart failures from 7.1

This commit is contained in:
Markus Pilman 2022-10-10 16:43:16 -06:00
parent 4d9465a30b
commit 8990891f8e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdbclient/include/fdbclient/CommitTransaction.h
View File

@ -296,6 +296,15 @@ struct CommitTransactionRef {
}
if (ar.protocolVersion().hasResolverPrivateMutations()) {
serializer(ar, lock_aware);
if (!ar.protocolVersion().hasOTELSpanContext()) {
Optional<UID> context;
serializer(ar, context);
if (context.present()) {
SpanContext res;
res.traceID = context.get();
spanContext = res;
}
}
}
if (ar.protocolVersion().hasOTELSpanContext()) {
serializer(ar, spanContext);

2
flow/ProtocolVersions.cmake
View File

@ -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")