@fluidframework/driver-utils 2.0.0-dev.2.3.0.115467 → 2.0.0-dev.4.1.0.148229

package/src/parallelRequests.ts

@@ -8,7 +8,7 @@ import { PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { IDeltasFetchResult, IStream, IStreamResult } from "@fluidframework/driver-definitions";
 import { getRetryDelayFromError, canRetryOnError, createGenericNetworkError } from "./network";
-import { waitForConnectedState, logNetworkFailure } from "./networkUtils";
+import { logNetworkFailure } from "./networkUtils";
 // For now, this package is versioned and released in unison with the specific drivers
 import { pkgVersion as driverVersion } from "./packageVersion";
 
@@ -30,274 +30,307 @@ type WorkingState = "working" | "done" | "canceled";
  * @returns - Queue that can be used to retrieve data
  */
 export class ParallelRequests<T> {
-    private latestRequested: number;
-    private nextToDeliver: number;
-    private readonly results: Map<number, T[]> = new Map();
-    private workingState: WorkingState = "working";
-    private requestsInFlight = 0;
-    private readonly endEvent = new Deferred<void>();
-    private requests = 0;
-    private readonly knewTo: boolean;
-
-    private get working() { return this.workingState === "working"; }
-    public get canceled() { return this.workingState === "canceled"; }
-
-    constructor(
-        from: number,
-        private to: number | undefined,
-        private readonly payloadSize: number,
-        private readonly logger: ITelemetryLogger,
-        private readonly requestCallback: (
-            request: number,
-            from: number,
-            to: number,
-            strongTo: boolean,
-            props: ITelemetryProperties) => Promise<{ partial: boolean; cancel: boolean; payload: T[]; }>,
-        private readonly responseCallback: (payload: T[]) => void) {
-        this.latestRequested = from;
-        this.nextToDeliver = from;
-        this.knewTo = (to !== undefined);
-    }
-
-    public cancel() {
-        if (this.working) {
-            this.workingState = "canceled";
-            this.endEvent.resolve();
-        }
-    }
-
-    public async run(concurrency: number) {
-        assert(concurrency > 0, 0x102 /* "invalid level of concurrency" */);
-        assert(this.working, 0x103 /* "trying to parallel run while not working" */);
-
-        let c = concurrency;
-        while (c > 0) {
-            c--;
-            this.addRequest();
-        }
-        this.dispatch();// will recalculate and trigger this.endEvent if needed
-        return this.endEvent.promise;
-    }
-
-    private done() {
-        // We should satisfy request fully.
-        assert(this.to !== undefined, 0x104 /* "undefined end point for parallel fetch" */);
-        assert(this.nextToDeliver >= this.to, 0x105 /* "unexpected end point for parallel fetch" */);
-        if (this.working) {
-            this.workingState = "done";
-            this.endEvent.resolve();
-        }
-    }
-
-    private fail(error) {
-        if (this.working) {
-            this.workingState = "done";
-            this.endEvent.reject(error);
-        }
-    }
-
-    private dispatch() {
-        while (this.working) {
-            const value = this.results.get(this.nextToDeliver);
-            if (value === undefined) {
-                break;
-            }
-            this.results.delete(this.nextToDeliver);
-            assert(value.length <= this.payloadSize, 0x1d9 /* "addRequestCore() should break into smaller chunks" */);
-            this.nextToDeliver += value.length;
-            this.responseCallback(value);
-        }
-
-        // Account for cancellation - state might be not in consistent state on cancelling operation
-        if (this.working) {
-            if (this.requestsInFlight === 0) {
-                // we should have dispatched everything, no matter whether we knew about the end or not.
-                // see comment in addRequestCore() around throwing away chunk if it's above this.to
-                assert(this.results.size === 0,
-                    0x107 /* "ending dispatch with remaining results to be sent" */);
-                this.done();
-            } else if (this.to !== undefined && this.nextToDeliver >= this.to) {
-                // Learned about the end and dispatched all the ops up to it.
-                // Ignore all the in-flight requests above boundary - unblock caller sooner.
-                assert(!this.knewTo, 0x108 /* "ending results dispatch but knew in advance about more requests" */);
-                this.done();
-            }
-        }
-    }
-
-    private getNextChunk() {
-        if (!this.working) {
-            return undefined;
-        }
-
-        const from = this.latestRequested;
-        if (this.to !== undefined) {
-            if (this.to <= from) {
-                return undefined;
-            }
-        }
-
-        // this.latestRequested
-        // inclusive on the right side! Exclusive on the left.
-        this.latestRequested += this.payloadSize;
-
-        if (this.to !== undefined) {
-            this.latestRequested = Math.min(this.to, this.latestRequested);
-        }
-
-        assert(from < this.latestRequested, 0x109 /* "unexpected next chunk position" */);
-
-        return { from, to: this.latestRequested };
-    }
-
-    private addRequest() {
-        const chunk = this.getNextChunk();
-        if (chunk === undefined) {
-            return;
-        }
-        this.addRequestCore(chunk.from, chunk.to).catch(this.fail.bind(this));
-    }
-
-    private async addRequestCore(fromArg: number, toArg: number) {
-        assert(this.working, 0x10a /* "cannot add parallel request while not working" */);
-
-        let from = fromArg;
-        let to = toArg;
-
-        // to & from are exclusive
-        this.requestsInFlight++;
-        while (this.working) {
-            const requestedLength = to - from;
-            assert(requestedLength > 0, 0x10b /* "invalid parallel request range" */);
-
-            // We should not be wasting time asking for something useless.
-            if (this.to !== undefined) {
-                assert(from < this.to, 0x10c /* "invalid parallel request start point" */);
-                assert(to <= this.to, 0x10d /* "invalid parallel request end point" */);
-            }
-
-            this.requests++;
-
-            const promise = this.requestCallback(this.requests, from, to, this.to !== undefined, {});
-
-            // dispatch any prior received data
-            this.dispatch();
-
-            const { payload, cancel, partial } = await promise;
-
-            if (cancel) {
-                this.cancel();
-            }
-
-            if (this.to !== undefined && from >= this.to) {
-                // while we were waiting for response, we learned on what is the boundary
-                // We can get here (with actual result!) if situation changed while this request was in
-                // flight, i.e. the end was extended over what we learn in some other request
-                // While it's useful not to throw this result, this is very corner cases and makes logic
-                // (including consistency checks) much harder to write correctly.
-                // So for now, we are throwing this result out the window.
-                assert(!this.knewTo, 0x10e /* "should not throw result if we knew about boundary in advance" */);
-                // Learn how often it happens and if it's too wasteful to throw these chunks.
-                // If it pops into our view a lot, we would need to reconsider how we approach it.
-                // Note that this is not visible to user other than potentially not hitting 100% of
-                // what we can in perf domain.
-                if (payload.length !== 0) {
-                    this.logger.sendErrorEvent({
-                        eventName: "ParallelRequests_GotExtra",
-                        from,
-                        to,
-                        end: this.to,
-                        length: payload.length,
-                    });
-                }
-
-                break;
-            }
-
-            if (this.working) {
-                const fromOrig = from;
-                const length = payload.length;
-                let fullChunk = (requestedLength <= length); // we can possible get more than we asked.
-
-                if (length !== 0) {
-                    // We can get more than we asked for!
-                    // This can screw up logic in dispatch!
-                    // So push only batch size, and keep the rest for later - if conditions are favorable, we
-                    // will be able to use it. If not (parallel request overlapping these ops), it's easier to
-                    // discard them and wait for another (overlapping) request to come in later.
-                    if (requestedLength < length) {
-                        // This is error in a sense that it's not expected and likely points bug in other layer.
-                        // This layer copes with this situation just fine.
-                        this.logger.sendTelemetryEvent({
-                            eventName: "ParallelRequests_Over",
-                            from,
-                            to,
-                            length,
-                        });
-                    }
-                    const data = payload.splice(0, requestedLength);
-                    this.results.set(from, data);
-                    from += data.length;
-                } else {
-                    // 1. empty (partial) chunks should not be returned by various caching / adapter layers -
-                    //    they should fall back to next layer. This might be important invariant to hold to ensure
-                    //    that we are less likely have bugs where such layer would keep returning empty partial
-                    //    result on each call.
-                    // 2. Current invariant is that callback does retries until it gets something,
-                    //    with the goal of failing if zero data is retrieved in given amount of time.
-                    //    This is very specific property of storage / ops, so this logic is not here, but given only
-                    //    one user of this class, we assert that to catch issues earlier.
-                    // These invariant can be relaxed if needed.
-                    assert(!partial, 0x10f /* "empty/partial chunks should not be returned by caching" */);
-                    assert(!this.knewTo,
-                        0x110 /* "callback should retry until valid fetch before it learns new boundary" */);
-                }
-
-                if (!partial && !fullChunk) {
-                    if (!this.knewTo) {
-                        if (this.to === undefined || this.to > from) {
-                            // The END
-                            this.to = from;
-                        }
-                        break;
-                    }
-                    // We know that there are more items to be retrieved
-                    // Can we get partial chunk? Ideally storage indicates that's not a full chunk
-                    // Note that it's possible that not all ops hit storage yet.
-                    // We will come back to request more, and if we can't get any more ops soon, it's
-                    // catastrophic failure (see comment above on responsibility of callback to return something)
-                    // This layer will just keep trying until it gets full set.
-                    this.logger.sendPerformanceEvent({
-                        eventName: "ParallelRequests_Partial",
-                        from: fromOrig,
-                        to,
-                        length,
-                    });
-                }
-
-                if (to === this.latestRequested) {
-                    // we can go after full chunk at the end if we received partial chunk, or more than asked
-                    // Also if we got more than we asked to, we can actually use those ops!
-                    if (payload.length !== 0) {
-                        this.results.set(from, payload);
-                        from += payload.length;
-                    }
-
-                    this.latestRequested = from;
-                    fullChunk = true;
-                }
-
-                if (fullChunk) {
-                    const chunk = this.getNextChunk();
-                    if (chunk === undefined) { break; }
-                    from = chunk.from;
-                    to = chunk.to;
-                }
-            }
-        }
-        this.requestsInFlight--;
-        this.dispatch();
-    }
+	private latestRequested: number;
+	private nextToDeliver: number;
+	private readonly results: Map<number, T[]> = new Map();
+	private workingState: WorkingState = "working";
+	private requestsInFlight = 0;
+	private readonly endEvent = new Deferred<void>();
+	private requests = 0;
+	private readonly knewTo: boolean;
+
+	private get working() {
+		return this.workingState === "working";
+	}
+	public get canceled() {
+		return this.workingState === "canceled";
+	}
+
+	constructor(
+		from: number,
+		private to: number | undefined,
+		private readonly payloadSize: number,
+		private readonly logger: ITelemetryLogger,
+		private readonly requestCallback: (
+			request: number,
+			from: number,
+			to: number,
+			strongTo: boolean,
+			props: ITelemetryProperties,
+		) => Promise<{ partial: boolean; cancel: boolean; payload: T[] }>,
+		private readonly responseCallback: (payload: T[]) => void,
+	) {
+		this.latestRequested = from;
+		this.nextToDeliver = from;
+		this.knewTo = to !== undefined;
+	}
+
+	public cancel() {
+		if (this.working) {
+			this.workingState = "canceled";
+			this.endEvent.resolve();
+		}
+	}
+
+	public async run(concurrency: number) {
+		assert(concurrency > 0, 0x102 /* "invalid level of concurrency" */);
+		assert(this.working, 0x103 /* "trying to parallel run while not working" */);
+
+		let c = concurrency;
+		while (c > 0) {
+			c--;
+			this.addRequest();
+		}
+		this.dispatch(); // will recalculate and trigger this.endEvent if needed
+		return this.endEvent.promise;
+	}
+
+	private done() {
+		// We should satisfy request fully.
+		assert(this.to !== undefined, 0x104 /* "undefined end point for parallel fetch" */);
+		assert(
+			this.nextToDeliver >= this.to,
+			0x105 /* "unexpected end point for parallel fetch" */,
+		);
+		if (this.working) {
+			this.workingState = "done";
+			this.endEvent.resolve();
+		}
+	}
+
+	private fail(error) {
+		if (this.working) {
+			this.workingState = "done";
+			this.endEvent.reject(error);
+		}
+	}
+
+	private dispatch() {
+		while (this.working) {
+			const value = this.results.get(this.nextToDeliver);
+			if (value === undefined) {
+				break;
+			}
+			this.results.delete(this.nextToDeliver);
+			assert(
+				value.length <= this.payloadSize,
+				0x1d9 /* "addRequestCore() should break into smaller chunks" */,
+			);
+			this.nextToDeliver += value.length;
+			this.responseCallback(value);
+		}
+
+		// Account for cancellation - state might be not in consistent state on cancelling operation
+		if (this.working) {
+			if (this.requestsInFlight === 0) {
+				// we should have dispatched everything, no matter whether we knew about the end or not.
+				// see comment in addRequestCore() around throwing away chunk if it's above this.to
+				assert(
+					this.results.size === 0,
+					0x107 /* "ending dispatch with remaining results to be sent" */,
+				);
+				this.done();
+			} else if (this.to !== undefined && this.nextToDeliver >= this.to) {
+				// Learned about the end and dispatched all the ops up to it.
+				// Ignore all the in-flight requests above boundary - unblock caller sooner.
+				assert(
+					!this.knewTo,
+					0x108 /* "ending results dispatch but knew in advance about more requests" */,
+				);
+				this.done();
+			}
+		}
+	}
+
+	private getNextChunk() {
+		if (!this.working) {
+			return undefined;
+		}
+
+		const from = this.latestRequested;
+		if (this.to !== undefined) {
+			if (this.to <= from) {
+				return undefined;
+			}
+		}
+
+		// this.latestRequested
+		// inclusive on the right side! Exclusive on the left.
+		this.latestRequested += this.payloadSize;
+
+		if (this.to !== undefined) {
+			this.latestRequested = Math.min(this.to, this.latestRequested);
+		}
+
+		assert(from < this.latestRequested, 0x109 /* "unexpected next chunk position" */);
+
+		return { from, to: this.latestRequested };
+	}
+
+	private addRequest() {
+		const chunk = this.getNextChunk();
+		if (chunk === undefined) {
+			return;
+		}
+		this.addRequestCore(chunk.from, chunk.to).catch(this.fail.bind(this));
+	}
+
+	private async addRequestCore(fromArg: number, toArg: number) {
+		assert(this.working, 0x10a /* "cannot add parallel request while not working" */);
+
+		let from = fromArg;
+		let to = toArg;
+
+		// to & from are exclusive
+		this.requestsInFlight++;
+		while (this.working) {
+			const requestedLength = to - from;
+			assert(requestedLength > 0, 0x10b /* "invalid parallel request range" */);
+
+			// We should not be wasting time asking for something useless.
+			if (this.to !== undefined) {
+				assert(from < this.to, 0x10c /* "invalid parallel request start point" */);
+				assert(to <= this.to, 0x10d /* "invalid parallel request end point" */);
+			}
+
+			this.requests++;
+
+			const promise = this.requestCallback(
+				this.requests,
+				from,
+				to,
+				this.to !== undefined,
+				{},
+			);
+
+			// dispatch any prior received data
+			this.dispatch();
+
+			const { payload, cancel, partial } = await promise;
+
+			if (cancel) {
+				this.cancel();
+			}
+
+			if (this.to !== undefined && from >= this.to) {
+				// while we were waiting for response, we learned on what is the boundary
+				// We can get here (with actual result!) if situation changed while this request was in
+				// flight, i.e. the end was extended over what we learn in some other request
+				// While it's useful not to throw this result, this is very corner cases and makes logic
+				// (including consistency checks) much harder to write correctly.
+				// So for now, we are throwing this result out the window.
+				assert(
+					!this.knewTo,
+					0x10e /* "should not throw result if we knew about boundary in advance" */,
+				);
+				// Learn how often it happens and if it's too wasteful to throw these chunks.
+				// If it pops into our view a lot, we would need to reconsider how we approach it.
+				// Note that this is not visible to user other than potentially not hitting 100% of
+				// what we can in perf domain.
+				if (payload.length !== 0) {
+					this.logger.sendErrorEvent({
+						eventName: "ParallelRequests_GotExtra",
+						from,
+						to,
+						end: this.to,
+						length: payload.length,
+					});
+				}
+
+				break;
+			}
+
+			if (this.working) {
+				const fromOrig = from;
+				const length = payload.length;
+				let fullChunk = requestedLength <= length; // we can possible get more than we asked.
+
+				if (length !== 0) {
+					// We can get more than we asked for!
+					// This can screw up logic in dispatch!
+					// So push only batch size, and keep the rest for later - if conditions are favorable, we
+					// will be able to use it. If not (parallel request overlapping these ops), it's easier to
+					// discard them and wait for another (overlapping) request to come in later.
+					if (requestedLength < length) {
+						// This is error in a sense that it's not expected and likely points bug in other layer.
+						// This layer copes with this situation just fine.
+						this.logger.sendTelemetryEvent({
+							eventName: "ParallelRequests_Over",
+							from,
+							to,
+							length,
+						});
+					}
+					const data = payload.splice(0, requestedLength);
+					this.results.set(from, data);
+					from += data.length;
+				} else {
+					// 1. empty (partial) chunks should not be returned by various caching / adapter layers -
+					//    they should fall back to next layer. This might be important invariant to hold to ensure
+					//    that we are less likely have bugs where such layer would keep returning empty partial
+					//    result on each call.
+					// 2. Current invariant is that callback does retries until it gets something,
+					//    with the goal of failing if zero data is retrieved in given amount of time.
+					//    This is very specific property of storage / ops, so this logic is not here, but given only
+					//    one user of this class, we assert that to catch issues earlier.
+					// These invariant can be relaxed if needed.
+					assert(
+						!partial,
+						0x10f /* "empty/partial chunks should not be returned by caching" */,
+					);
+					assert(
+						!this.knewTo,
+						0x110 /* "callback should retry until valid fetch before it learns new boundary" */,
+					);
+				}
+
+				if (!partial && !fullChunk) {
+					if (!this.knewTo) {
+						if (this.to === undefined || this.to > from) {
+							// The END
+							this.to = from;
+						}
+						break;
+					}
+					// We know that there are more items to be retrieved
+					// Can we get partial chunk? Ideally storage indicates that's not a full chunk
+					// Note that it's possible that not all ops hit storage yet.
+					// We will come back to request more, and if we can't get any more ops soon, it's
+					// catastrophic failure (see comment above on responsibility of callback to return something)
+					// This layer will just keep trying until it gets full set.
+					this.logger.sendPerformanceEvent({
+						eventName: "ParallelRequests_Partial",
+						from: fromOrig,
+						to,
+						length,
+					});
+				}
+
+				if (to === this.latestRequested) {
+					// we can go after full chunk at the end if we received partial chunk, or more than asked
+					// Also if we got more than we asked to, we can actually use those ops!
+					if (payload.length !== 0) {
+						this.results.set(from, payload);
+						from += payload.length;
+					}
+
+					this.latestRequested = from;
+					fullChunk = true;
+				}
+
+				if (fullChunk) {
+					const chunk = this.getNextChunk();
+					if (chunk === undefined) {
+						break;
+					}
+					from = chunk.from;
+					to = chunk.to;
+				}
+			}
+		}
+		this.requestsInFlight--;
+		this.dispatch();
+	}
 }
 
 /**
@@ -305,47 +338,60 @@ export class ParallelRequests<T> {
  * It's essentially a pipe allowing multiple writers, and single reader
  */
 export class Queue<T> implements IStream<T> {
-    private readonly queue: Promise<IStreamResult<T>>[] = [];
-    private deferred: Deferred<IStreamResult<T>> | undefined;
-    private done = false;
-
-    public pushValue(value: T) {
-        this.pushCore(Promise.resolve({ done: false, value }));
-    }
-
-    public pushError(error: any) {
-        this.pushCore(Promise.reject(error));
-        this.done = true;
-    }
-
-    public pushDone() {
-        this.pushCore(Promise.resolve({ done: true }));
-        this.done = true;
-    }
-
-    protected pushCore(value: Promise<IStreamResult<T>>) {
-        assert(!this.done, 0x112 /* "cannot push onto queue if done" */);
-        if (this.deferred) {
-            assert(this.queue.length === 0, 0x113 /* "deferred queue should be empty" */);
-            this.deferred.resolve(value);
-            this.deferred = undefined;
-        } else {
-            this.queue.push(value);
-        }
-    }
-
-    public async read(): Promise<IStreamResult<T>> {
-        assert(this.deferred === undefined, 0x114 /* "cannot pop if deferred" */);
-        const value = this.queue.shift();
-        if (value !== undefined) {
-            return value;
-        }
-        assert(!this.done, 0x115 /* "queue should not be done during pop" */);
-        this.deferred = new Deferred<IStreamResult<T>>();
-        return this.deferred.promise;
-    }
+	private readonly queue: Promise<IStreamResult<T>>[] = [];
+	private deferred: Deferred<IStreamResult<T>> | undefined;
+	private done = false;
+
+	public pushValue(value: T) {
+		this.pushCore(Promise.resolve({ done: false, value }));
+	}
+
+	public pushError(error: any) {
+		this.pushCore(Promise.reject(error));
+		this.done = true;
+	}
+
+	public pushDone() {
+		this.pushCore(Promise.resolve({ done: true }));
+		this.done = true;
+	}
+
+	protected pushCore(value: Promise<IStreamResult<T>>) {
+		assert(!this.done, 0x112 /* "cannot push onto queue if done" */);
+		if (this.deferred) {
+			assert(this.queue.length === 0, 0x113 /* "deferred queue should be empty" */);
+			this.deferred.resolve(value);
+			this.deferred = undefined;
+		} else {
+			this.queue.push(value);
+		}
+	}
+
+	public async read(): Promise<IStreamResult<T>> {
+		assert(this.deferred === undefined, 0x114 /* "cannot pop if deferred" */);
+		const value = this.queue.shift();
+		if (value !== undefined) {
+			return value;
+		}
+		assert(!this.done, 0x115 /* "queue should not be done during pop" */);
+		this.deferred = new Deferred<IStreamResult<T>>();
+		return this.deferred.promise;
+	}
 }
 
+const waitForOnline = async (): Promise<void> => {
+	// Only wait if we have a strong signal that we're offline - otherwise assume we're online.
+	if (globalThis.navigator?.onLine === false && globalThis.addEventListener !== undefined) {
+		return new Promise<void>((resolve) => {
+			const resolveAndRemoveListener = () => {
+				resolve();
+				globalThis.removeEventListener("online", resolveAndRemoveListener);
+			};
+			globalThis.addEventListener("online", resolveAndRemoveListener);
+		});
+	}
+};
+
 /**
  * Retrieve single batch of ops
  * @param request - request index
@@ -360,93 +406,100 @@ export class Queue<T> implements IStream<T> {
  * @returns - an object with resulting ops and cancellation / partial result flags
  */
 async function getSingleOpBatch(
-    get: (telemetryProps: ITelemetryProperties) => Promise<IDeltasFetchResult>,
-    props: ITelemetryProperties,
-    strongTo: boolean,
-    logger: ITelemetryLogger,
-    signal?: AbortSignal,
-    scenarioName?: string):
-        Promise<{ partial: boolean; cancel: boolean; payload: ISequencedDocumentMessage[]; }> {
-    let lastSuccessTime: number | undefined;
-
-    let retry: number = 0;
-    const deltas: ISequencedDocumentMessage[] = [];
-    const nothing = { partial: false, cancel: true, payload: [] };
-
-    while (signal?.aborted !== true) {
-        retry++;
-        let delay = Math.min(MaxFetchDelayInMs, MissingFetchDelayInMs * Math.pow(2, retry));
-        const startTime = performance.now();
-
-        try {
-            // Issue async request for deltas - limit the number fetched to MaxBatchDeltas
-            const deltasP = get({ ...props, retry } /* telemetry props */);
-
-            const { messages, partialResult } = await deltasP;
-            deltas.push(...messages);
-
-            const deltasRetrievedLast = messages.length;
-
-            if (deltasRetrievedLast !== 0 || !strongTo) {
-                return { payload: deltas, cancel: false, partial: partialResult };
-            }
-
-            // Storage does not have ops we need.
-            // Attempt to fetch more deltas. If we didn't receive any in the previous call we up our retry
-            // count since something prevented us from seeing those deltas
-
-            if (lastSuccessTime === undefined) {
-                lastSuccessTime = performance.now();
-            } else if (performance.now() - lastSuccessTime > 30000) {
-                // If we are connected and receiving proper responses from server, but can't get any ops back,
-                // then give up after some time. This likely indicates the issue with ordering service not flushing
-                // ops to storage quick enough, and possibly waiting for summaries, while summarizer can't get
-                // current as it can't get ops.
-                throw createGenericNetworkError(
-                    // pre-0.58 error message: failedToRetrieveOpsFromStorage:TooManyRetries
-                    "Failed to retrieve ops from storage (Too Many Retries)",
-                    { canRetry: false },
-                    {
-                        retry,
-                        driverVersion,
-                        ...props,
-                    },
-                );
-            }
-        } catch (error) {
-            const canRetry = canRetryOnError(error);
-
-            lastSuccessTime = undefined;
-
-            const retryAfter = getRetryDelayFromError(error);
-
-            // This will log to error table only if the error is non-retryable
-            logNetworkFailure(
-                logger,
-                {
-                    eventName: "GetDeltas_Error",
-                    ...props,
-                    retry,
-                    duration: performance.now() - startTime,
-                    retryAfter,
-                    reason: scenarioName,
-                },
-                error);
-
-            if (!canRetry) {
-                // It's game over scenario.
-                throw error;
-            }
-
-            if (retryAfter !== undefined && retryAfter >= 0) {
-                delay = retryAfter;
-            }
-        }
-
-        await waitForConnectedState(delay);
-    }
-
-    return nothing;
+	get: (telemetryProps: ITelemetryProperties) => Promise<IDeltasFetchResult>,
+	props: ITelemetryProperties,
+	strongTo: boolean,
+	logger: ITelemetryLogger,
+	signal?: AbortSignal,
+	scenarioName?: string,
+): Promise<{ partial: boolean; cancel: boolean; payload: ISequencedDocumentMessage[] }> {
+	let lastSuccessTime: number | undefined;
+
+	let retry: number = 0;
+	const nothing = { partial: false, cancel: true, payload: [] };
+
+	while (signal?.aborted !== true) {
+		retry++;
+		let delay = Math.min(MaxFetchDelayInMs, MissingFetchDelayInMs * Math.pow(2, retry));
+		const startTime = performance.now();
+
+		try {
+			// Issue async request for deltas
+			const { messages, partialResult } = await get(
+				{ ...props, retry } /* telemetry props */,
+			);
+
+			// If we got messages back, return them.  Return regardless of whether we got messages back if we didn't
+			// specify a "to", since we don't have an expectation of how many to receive.
+			if (messages.length !== 0 || !strongTo) {
+				return { payload: messages, cancel: false, partial: partialResult };
+			}
+
+			// Otherwise, the storage gave us back an empty set of ops but we were expecting a non-empty set.
+
+			if (lastSuccessTime === undefined) {
+				// Take timestamp of the first time server responded successfully, even though it wasn't with the ops we asked for.
+				// If we keep getting empty responses we'll eventually fail out below.
+				lastSuccessTime = performance.now();
+			} else if (performance.now() - lastSuccessTime > 30000) {
+				// If we are connected and receiving proper responses from server, but can't get any ops back,
+				// then give up after some time. This likely indicates the issue with ordering service not flushing
+				// ops to storage quick enough, and possibly waiting for summaries, while summarizer can't get
+				// current as it can't get ops.
+				throw createGenericNetworkError(
+					// pre-0.58 error message: failedToRetrieveOpsFromStorage:TooManyRetries
+					"Failed to retrieve ops from storage (Too Many Retries)",
+					{ canRetry: false },
+					{
+						retry,
+						driverVersion,
+						...props,
+					},
+				);
+			}
+		} catch (error) {
+			const canRetry = canRetryOnError(error);
+
+			const retryAfter = getRetryDelayFromError(error);
+
+			// This will log to error table only if the error is non-retryable
+			logNetworkFailure(
+				logger,
+				{
+					eventName: "GetDeltas_Error",
+					...props,
+					retry,
+					duration: performance.now() - startTime,
+					retryAfter,
+					reason: scenarioName,
+				},
+				error,
+			);
+
+			if (!canRetry) {
+				// It's game over scenario.
+				throw error;
+			}
+
+			if (retryAfter !== undefined) {
+				// If the error told us to wait, then we will wait for that specific amount rather than the default.
+				delay = retryAfter;
+			}
+		}
+
+		// If we get here something has gone wrong - either got an unexpected empty set of messages back or a real error.
+		// Either way we will wait a little bit before retrying.
+		await new Promise<void>((resolve) => {
+			setTimeout(resolve, delay);
+		});
+
+		// If we believe we're offline, we assume there's no point in trying until we at least think we're online.
+		// NOTE: This isn't strictly true for drivers that don't require network (e.g. local driver).  Really this logic
+		// should probably live in the driver.
+		await waitForOnline();
+	}
+
+	return nothing;
 }
 
 /**
@@ -462,127 +515,155 @@ async function getSingleOpBatch(
  * @returns - Messages fetched
  */
 export function requestOps(
-    get: (from: number, to: number, telemetryProps: ITelemetryProperties) => Promise<IDeltasFetchResult>,
-    concurrency: number,
-    fromTotal: number,
-    toTotal: number | undefined,
-    payloadSize: number,
-    logger: ITelemetryLogger,
-    signal?: AbortSignal,
-    scenarioName?: string,
+	get: (
+		from: number,
+		to: number,
+		telemetryProps: ITelemetryProperties,
+	) => Promise<IDeltasFetchResult>,
+	concurrency: number,
+	fromTotal: number,
+	toTotal: number | undefined,
+	payloadSize: number,
+	logger: ITelemetryLogger,
+	signal?: AbortSignal,
+	scenarioName?: string,
 ): IStream<ISequencedDocumentMessage[]> {
-    let requests = 0;
-    let lastFetch: number | undefined;
-    let length = 0;
-    const queue = new Queue<ISequencedDocumentMessage[]>();
-
-    const propsTotal: ITelemetryProperties = {
-        fromTotal,
-        toTotal,
-    };
-
-    const telemetryEvent = PerformanceEvent.start(logger, {
-        eventName: "GetDeltas",
-        ...propsTotal,
-        reason: scenarioName,
-    });
-
-    const manager = new ParallelRequests<ISequencedDocumentMessage>(
-        fromTotal,
-        toTotal,
-        payloadSize,
-        logger,
-        async (request: number, from: number, to: number, strongTo: boolean, propsPerRequest: ITelemetryProperties) => {
-            requests++;
-            return getSingleOpBatch(
-                async (propsAll) => get(from, to, propsAll),
-                { request, from, to, ...propsTotal, ...propsPerRequest },
-                strongTo,
-                logger,
-                signal,
-                scenarioName,
-            );
-        },
-        (deltas: ISequencedDocumentMessage[]) => {
-            // Assert continuing and right start.
-            if (lastFetch === undefined) {
-                assert(deltas[0].sequenceNumber === fromTotal, 0x26d /* "wrong start" */);
-            } else {
-                assert(deltas[0].sequenceNumber === lastFetch + 1, 0x26e /* "wrong start" */);
-            }
-            lastFetch = deltas[deltas.length - 1].sequenceNumber;
-            assert(lastFetch - deltas[0].sequenceNumber + 1 === deltas.length,
-                0x26f /* "continuous and no duplicates" */);
-            length += deltas.length;
-            queue.pushValue(deltas);
-        });
-
-    // Implement faster cancellation. getSingleOpBatch() checks signal, but only in between
-    // waits (up to 10 seconds) and fetches (can take infinite amount of time).
-    // While every such case should be improved and take into account signal (and thus cancel immediately),
-    // it is beneficial to have catch-all
-    const listener = (event: Event) => { manager.cancel(); };
-    if (signal !== undefined) {
-        signal.addEventListener("abort", listener);
-    }
-
-    manager.run(concurrency)
-        .finally(() => {
-            if (signal !== undefined) {
-                signal.removeEventListener("abort", listener);
-            }
-        }).then(() => {
-            const props = {
-                lastFetch,
-                length,
-                requests,
-            };
-            if (manager.canceled) {
-                telemetryEvent.cancel({ ...props, error: "ops request cancelled by client" });
-            } else {
-                assert(toTotal === undefined || lastFetch !== undefined && lastFetch >= toTotal - 1,
-                    0x270 /* "All requested ops fetched" */);
-                telemetryEvent.end(props);
-            }
-            queue.pushDone();
-        })
-        .catch((error) => {
-            telemetryEvent.cancel({
-                lastFetch,
-                length,
-                requests,
-            }, error);
-            queue.pushError(error);
-        });
-
-    return queue;
+	let requests = 0;
+	let lastFetch: number | undefined;
+	let length = 0;
+	const queue = new Queue<ISequencedDocumentMessage[]>();
+
+	const propsTotal: ITelemetryProperties = {
+		fromTotal,
+		toTotal,
+	};
+
+	const telemetryEvent = PerformanceEvent.start(logger, {
+		eventName: "GetDeltas",
+		...propsTotal,
+		reason: scenarioName,
+	});
+
+	const manager = new ParallelRequests<ISequencedDocumentMessage>(
+		fromTotal,
+		toTotal,
+		payloadSize,
+		logger,
+		async (
+			request: number,
+			from: number,
+			to: number,
+			strongTo: boolean,
+			propsPerRequest: ITelemetryProperties,
+		) => {
+			requests++;
+			return getSingleOpBatch(
+				async (propsAll) => get(from, to, propsAll),
+				{ request, from, to, ...propsTotal, ...propsPerRequest },
+				strongTo,
+				logger,
+				signal,
+				scenarioName,
+			);
+		},
+		(deltas: ISequencedDocumentMessage[]) => {
+			// Assert continuing and right start.
+			if (lastFetch === undefined) {
+				assert(deltas[0].sequenceNumber === fromTotal, 0x26d /* "wrong start" */);
+			} else {
+				assert(deltas[0].sequenceNumber === lastFetch + 1, 0x26e /* "wrong start" */);
+			}
+			lastFetch = deltas[deltas.length - 1].sequenceNumber;
+			assert(
+				lastFetch - deltas[0].sequenceNumber + 1 === deltas.length,
+				0x26f /* "continuous and no duplicates" */,
+			);
+			length += deltas.length;
+			queue.pushValue(deltas);
+		},
+	);
+
+	// Implement faster cancellation. getSingleOpBatch() checks signal, but only in between
+	// waits (up to 10 seconds) and fetches (can take infinite amount of time).
+	// While every such case should be improved and take into account signal (and thus cancel immediately),
+	// it is beneficial to have catch-all
+	const listener = (event: Event) => {
+		manager.cancel();
+	};
+	if (signal !== undefined) {
+		signal.addEventListener("abort", listener);
+	}
+
+	manager
+		.run(concurrency)
+		.finally(() => {
+			if (signal !== undefined) {
+				signal.removeEventListener("abort", listener);
+			}
+		})
+		.then(() => {
+			const props = {
+				lastFetch,
+				length,
+				requests,
+			};
+			if (manager.canceled) {
+				telemetryEvent.cancel({ ...props, error: "ops request cancelled by client" });
+			} else {
+				assert(
+					toTotal === undefined || (lastFetch !== undefined && lastFetch >= toTotal - 1),
+					0x270 /* "All requested ops fetched" */,
+				);
+				telemetryEvent.end(props);
+			}
+			queue.pushDone();
+		})
+		.catch((error) => {
+			telemetryEvent.cancel(
+				{
+					lastFetch,
+					length,
+					requests,
+				},
+				error,
+			);
+			queue.pushError(error);
+		});
+
+	return queue;
 }
 
 export const emptyMessageStream: IStream<ISequencedDocumentMessage[]> = {
-    read: async () => { return { done: true }; },
+	read: async () => {
+		return { done: true };
+	},
 };
 
-export function streamFromMessages(messagesArg: Promise<ISequencedDocumentMessage[]>):
-    IStream<ISequencedDocumentMessage[]> {
-    let messages: Promise<ISequencedDocumentMessage[]> | undefined = messagesArg;
-    return {
-        read: async () => {
-            if (messages === undefined) {
-                return { done: true };
-            }
-            const value = await messages;
-            messages = undefined;
-            return value.length === 0 ? { done: true } : { done: false, value };
-        },
-    };
+export function streamFromMessages(
+	messagesArg: Promise<ISequencedDocumentMessage[]>,
+): IStream<ISequencedDocumentMessage[]> {
+	let messages: Promise<ISequencedDocumentMessage[]> | undefined = messagesArg;
+	return {
+		read: async () => {
+			if (messages === undefined) {
+				return { done: true };
+			}
+			const value = await messages;
+			messages = undefined;
+			return value.length === 0 ? { done: true } : { done: false, value };
+		},
+	};
 }
 
-export function streamObserver<T>(stream: IStream<T>, handler: (value: IStreamResult<T>) => void): IStream<T> {
-    return {
-        read: async () => {
-            const value = await stream.read();
-            handler(value);
-            return value;
-        },
-    };
+export function streamObserver<T>(
+	stream: IStream<T>,
+	handler: (value: IStreamResult<T>) => void,
+): IStream<T> {
+	return {
+		read: async () => {
+			const value = await stream.read();
+			handler(value);
+			return value;
+		},
+	};
 }