catch exceptions

fdbrpc/fdbrpc.h

@@ -406,8 +406,6 @@ struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
 template <class T>
 class ReplyPromiseStream {
 public:
-	// The endpoints of a ReplyPromiseStream must be initialized at Task::ReadSocket, because with lower priorities a
-	// delay(0) in FlowTransport deliver can cause out of order delivery.
 
 	// stream.send( request )
 	//   Unreliable at most once delivery: Delivers request unless there is a connection failure (zero or one times)
@@ -477,6 +475,8 @@ public:
 			errors->delPromiseRef();
 	}
 
+    // The endpoints of a ReplyPromiseStream must be initialized at Task::ReadSocket, because with lower priorities a
+    // delay(0) in FlowTransport deliver can cause out of order delivery.
 	const Endpoint& getEndpoint() const { return queue->getEndpoint(TaskPriority::ReadSocket); }
 
 	bool operator==(const ReplyPromiseStream<T>& rhs) const { return queue == rhs.queue; }

fdbserver/LogSystemPeekCursor.actor.cpp

@@ -386,13 +386,15 @@ Future<Void> ILogSystem::ServerPeekCursor::getMore(TaskPriority taskID) {
 	if (hasMessage() && !parallelGetMore)
 		return Void();
 	if (!more.isValid() || more.isReady()) {
-		if (usePeekStream) {
+		if (usePeekStream && taskID == TaskPriority::TLogPeekReply) {
 			more = serverPeekStreamGetMore(this, taskID);
-		} else if (parallelGetMore || onlySpilled || futureResults.size()) {
-			more = serverPeekParallelGetMore(this, taskID);
-		} else {
-			more = serverPeekGetMore(this, taskID);
 		}
+//        if (parallelGetMore || onlySpilled || futureResults.size()) {
+//            more = serverPeekParallelGetMore(this, taskID);
+//        }
+		else {
+            more = serverPeekGetMore(this, taskID);
+        }
 	}
 	return more;
 }

fdbserver/TLogInterface.h

@@ -83,7 +83,7 @@ struct TLogInterface {
 		streams.push_back(disablePopRequest.getReceiver());
 		streams.push_back(enablePopRequest.getReceiver());
 		streams.push_back(snapRequest.getReceiver());
-        streams.push_back(peekStreamMessages.getReceiver(TaskPriority::ReadSocket));
+        streams.push_back(peekStreamMessages.getReceiver(TaskPriority::TLogPeek));
         FlowTransport::transport().addEndpoints(streams);
 	}
 

fdbserver/TLogServer.actor.cpp

@@ -1916,15 +1916,17 @@ ACTOR Future<Void> tLogPeekStream(TLogData* self, TLogPeekStreamRequest req, Ref
 			req.reply.send(reply);
 			begin = reply.rep.end;
 			onlySpilled = reply.rep.onlySpilled;
-
-			wait(delay(0.005, TaskPriority::TLogPeekReply));
 			// return Void();
 		} catch (Error& e) {
 			if (e.code() == error_code_end_of_stream) {
 				req.reply.sendError(e);
 				return Void();
+			}
+			else if (e.code() == error_code_operation_obsolete) {
+				// reply stream is cancelled on the client
+			    return Void();
 			} else {
-				throw;
+					throw;
 			}
 		}
 	}