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

Adding back debug stream uid to help track down bugs

This commit is contained in:
Josh Slocum 2022-03-10 13:55:42 -06:00
parent 903f7adbc4
commit 211e5b579a
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdbclient/NativeAPI.actor.cpp
View File

@ -7788,6 +7788,9 @@ ACTOR Future<Void> mergeChangeFeedStream(Reference<DatabaseContext> db,
if (replyBufferSize != -1 && req.replyBufferSize < CLIENT_KNOBS->CHANGE_FEED_STREAM_MIN_BYTES) { if (replyBufferSize != -1 && req.replyBufferSize < CLIENT_KNOBS->CHANGE_FEED_STREAM_MIN_BYTES) {
req.replyBufferSize = CLIENT_KNOBS->CHANGE_FEED_STREAM_MIN_BYTES; req.replyBufferSize = CLIENT_KNOBS->CHANGE_FEED_STREAM_MIN_BYTES;
} }
// TODO REMOVE
req.debugUID = deterministicRandom()->randomUniqueID();
results->streams.push_back(it.first.changeFeedStream.getReplyStream(req)); results->streams.push_back(it.first.changeFeedStream.getReplyStream(req));
} }
@ -7934,6 +7937,8 @@ ACTOR Future<Void> singleChangeFeedStream(Reference<DatabaseContext> db,
req.range = range; req.range = range;
req.canReadPopped = canReadPopped; req.canReadPopped = canReadPopped;
req.replyBufferSize = replyBufferSize; req.replyBufferSize = replyBufferSize;
// TODO REMOVE
req.debugUID = deterministicRandom()->randomUniqueID();
results->streams.clear(); results->streams.clear();

4
fdbclient/StorageServerInterface.h
View File

@ -793,13 +793,15 @@ struct ChangeFeedStreamRequest {
KeyRange range; KeyRange range;
int replyBufferSize = -1; int replyBufferSize = -1;
bool canReadPopped = true; bool canReadPopped = true;
// TODO REMOVE
UID debugUID;
ReplyPromiseStream<ChangeFeedStreamReply> reply; ReplyPromiseStream<ChangeFeedStreamReply> reply;
ChangeFeedStreamRequest() {} ChangeFeedStreamRequest() {}
template <class Ar> template <class Ar>
void serialize(Ar& ar) { void serialize(Ar& ar) {
serializer(ar, rangeID, begin, end, range, reply, spanContext, replyBufferSize, canReadPopped, arena); serializer(ar, rangeID, begin, end, range, reply, spanContext, replyBufferSize, canReadPopped, debugUID, arena);
} }
}; };

4
fdbserver/storageserver.actor.cpp
View File

@ -7884,7 +7884,9 @@ ACTOR Future<Void> serveChangeFeedStreamRequests(StorageServer* self,
ChangeFeedStreamRequest req = waitNext(changeFeedStream); ChangeFeedStreamRequest req = waitNext(changeFeedStream);
// must notify change feed that its shard is moved away ASAP // must notify change feed that its shard is moved away ASAP
UID streamUID = deterministicRandom()->randomUniqueID(); // TODO CHANGE BACK
// UID streamUID = deterministicRandom()->randomUniqueID();
UID streamUID = req.debugUID;
self->actors.add(changeFeedStreamQ(self, req, streamUID) || stopChangeFeedOnMove(self, req, streamUID)); self->actors.add(changeFeedStreamQ(self, req, streamUID) || stopChangeFeedOnMove(self, req, streamUID));
} }
} }