Container Rehydration from a snapshot taken from detached container.

packages/dds/cell/src/cell.ts

@@ -202,7 +202,7 @@ export class SharedCell<T extends Serializable = any> extends SharedObject<IShar
      * @returns - promise that resolved when the load is completed
      */
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService): Promise<void> {
         const rawContent = await storage.read(snapshotFileName);
 

packages/dds/cell/src/cellFactory.ts

@@ -37,7 +37,7 @@ export class CellFactory implements IChannelFactory {
         runtime: IFluidDataStoreRuntime,
         id: string,
         services: IChannelServices,
-        branchId: string,
+        branchId: string | undefined,
         attributes: IChannelAttributes): Promise<ISharedCell> {
         const cell = new SharedCell(id, runtime, attributes);
         await cell.load(branchId, services);

packages/dds/counter/src/counter.ts

@@ -135,7 +135,7 @@ export class SharedCounter extends SharedObject<ISharedCounterEvents> implements
      * @returns - promise that resolved when the load is completed
      */
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService): Promise<void> {
         const rawContent = await storage.read(snapshotFileName);
 

packages/dds/ink/src/ink.ts

@@ -154,7 +154,7 @@ export class Ink extends SharedObject<IInkEvents> implements IInk {
      * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
      */
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService,
     ): Promise<void> {
         const header = await storage.read(snapshotFileName);

packages/dds/map/src/directory.ts

@@ -653,7 +653,7 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
      * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
      */
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService) {
         const header = await storage.read(snapshotFileName);
         const data = JSON.parse(fromBase64ToUtf8(header));

packages/dds/map/src/map.ts

@@ -333,7 +333,7 @@ export class SharedMap extends SharedObject<ISharedMapEvents> implements IShared
     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
     */
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService) {
         const header = await storage.read(snapshotFileName);
 

packages/dds/matrix/src/matrix.ts

@@ -551,7 +551,7 @@ export class SharedMatrix<T extends Serializable = Serializable>
         debug(`${this.id} is now disconnected`);
     }
 
-    protected async loadCore(branchId: string, storage: IChannelStorageService) {
+    protected async loadCore(branchId: string | undefined, storage: IChannelStorageService) {
         try {
             await this.rows.load(this.runtime, new ObjectStoragePartition(storage, SnapshotPath.rows), branchId);
             await this.cols.load(this.runtime, new ObjectStoragePartition(storage, SnapshotPath.cols), branchId);

packages/dds/merge-tree/package.json

@@ -53,6 +53,7 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.18.1",
     "@fluidframework/common-utils": "^0.21.0",
+    "@fluidframework/container-definitions": "^0.25.1",
     "@fluidframework/core-interfaces": "^0.25.1",
     "@fluidframework/datastore-definitions": "^0.25.1",
     "@fluidframework/protocol-definitions": "^0.1011.1-0",

packages/dds/merge-tree/src/snapshotLoader.ts

@@ -9,6 +9,7 @@ import { ChildLogger } from "@fluidframework/telemetry-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { IFluidDataStoreRuntime, IChannelStorageService } from "@fluidframework/datastore-definitions";
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { AttachState } from "@fluidframework/container-definitions";
 import { Client } from "./client";
 import { NonCollabClient, UniversalSequenceNumber } from "./constants";
 import { ISegment, MergeTree } from "./mergeTree";
@@ -134,24 +135,25 @@ export class SnapshotLoader {
         if (chunk.headerMetadata === undefined) {
             throw new Error("header metadata not available");
         }
-        // specify a default client id, "snapshot" here as we
-        // should enter collaboration/op sending mode if we load
-        // a snapshot in any case (summary or attach message)
-        // once we get a client id this will be called with that
-        // clientId in the connected event
-        // TODO: this won't support rehydrating a detached container
-        // we need to think more holistically about the dds state machine
-        // now that we differentiate attached vs local
-        this.client.startOrUpdateCollaboration(
-            this.runtime.clientId ?? "snapshot",
-
-            // TODO: Make 'minSeq' non-optional once the new snapshot format becomes the default?
-            //       (See https://github.com/microsoft/FluidFramework/issues/84)
-            /* minSeq: */ chunk.headerMetadata.minSequenceNumber !== undefined
-                ? chunk.headerMetadata.minSequenceNumber
-                : chunk.headerMetadata.sequenceNumber,
-            /* currentSeq: */ chunk.headerMetadata.sequenceNumber,
-            branching);
+        // If we load a detached container from snapshot, then we don't supply a default clientId
+        // because we don't want to start collaboration.
+        if (this.runtime.attachState !== AttachState.Detached) {
+            // specify a default client id, "snapshot" here as we
+            // should enter collaboration/op sending mode if we load
+            // a snapshot in any case (summary or attach message)
+            // once we get a client id this will be called with that
+            // clientId in the connected event
+            this.client.startOrUpdateCollaboration(
+                this.runtime.clientId ?? "snapshot",
+
+                // TODO: Make 'minSeq' non-optional once the new snapshot format becomes the default?
+                //       (See https://github.com/microsoft/FluidFramework/issues/84)
+                /* minSeq: */ chunk.headerMetadata.minSequenceNumber !== undefined
+                    ? chunk.headerMetadata.minSequenceNumber
+                    : chunk.headerMetadata.sequenceNumber,
+                /* currentSeq: */ chunk.headerMetadata.sequenceNumber,
+                branching);
+        }
 
         return chunk;
     }

packages/dds/ordered-collection/src/consensusOrderedCollection.ts

@@ -273,7 +273,7 @@ export class ConsensusOrderedCollection<T = any>
     }
 
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService): Promise<void> {
         assert(this.jobTracking.size === 0);
         const rawContentTracking = await storage.read(snapshotFileNameTracking);

packages/dds/register-collection/src/consensusRegisterCollection.ts

@@ -210,7 +210,7 @@ export class ConsensusRegisterCollection<T>
     }
 
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService,
     ): Promise<void> {
         const header = await storage.read(snapshotFileName);

packages/dds/sequence/src/sequence.ts

@@ -487,7 +487,7 @@ export abstract class SharedSegmentSequence<T extends MergeTree.ISegment>
     }
 
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService) {
         const header = await storage.read(snapshotFileName);
 

packages/dds/sequence/src/sharedIntervalCollection.ts

@@ -174,7 +174,7 @@ export class SharedIntervalCollection<TInterval extends ISerializableInterval =
     }
 
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService) {
         const header = await storage.read(snapshotFileName);
 

packages/dds/shared-object-base/src/sharedObject.ts

@@ -130,14 +130,18 @@ export abstract class SharedObject<TEvent extends ISharedObjectEvents = ISharedO
      * @param services - Services used by the shared object
      */
     public async load(
-        branchId: string,
-        services: IChannelServices): Promise<void> {
-        this.services = services;
-
+        branchId: string | undefined,
+        services: IChannelServices,
+    ): Promise<void> {
+        if (this.runtime.attachState !== AttachState.Detached) {
+            this.services = services;
+        }
         await this.loadCore(
             branchId,
             services.objectStorage);
-        this.attachDeltaHandler();
+        if (this.runtime.attachState !== AttachState.Detached) {
+            this.attachDeltaHandler();
+        }
     }
 
     /**
@@ -200,7 +204,7 @@ export abstract class SharedObject<TEvent extends ISharedObjectEvents = ISharedO
      * @param services - Storage used by the shared object
      */
     protected abstract loadCore(
-        branchId: string,
+        branchId: string | undefined,
         services: IChannelStorageService): Promise<void>;
 
     /**

packages/dds/shared-summary-block/src/sharedSummaryBlock.ts

@@ -127,7 +127,7 @@ export class SharedSummaryBlock extends SharedObject implements ISharedSummaryBl
      * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
      */
     protected async loadCore(
-        branchId: string,
+        branchId: string | undefined,
         storage: IChannelStorageService): Promise<void> {
         const rawContent = await storage.read(snapshotFileName);
         const contents = JSON.parse(fromBase64ToUtf8(rawContent)) as ISharedSummaryBlockDataSerializable;

packages/loader/container-definitions/src/loader.ts

@@ -9,6 +9,7 @@ import {
     IDocumentMessage,
     IQuorum,
     ISequencedDocumentMessage,
+    ISnapshotTree,
 } from "@fluidframework/protocol-definitions";
 import { IResolvedUrl } from "@fluidframework/driver-definitions";
 import { IEvent, IEventProvider } from "@fluidframework/common-definitions";
@@ -149,6 +150,12 @@ export interface ILoader {
      * updates will only be local until the user explicitly attaches the container to a service provider.
      */
     createDetachedContainer(source: IFluidCodeDetails): Promise<IContainer>;
+
+    /**
+     * Creates a new container using the specified snapshot but in an unattached state. While unattached all
+     * updates will only be local until the user explicitly attaches the container to a service provider.
+     */
+    createDetachedContainerFromSnapshot(source: ISnapshotTree): Promise<IContainer>;
 }
 
 export enum LoaderHeader {

packages/loader/container-definitions/src/runtime.ts

@@ -111,7 +111,7 @@ export interface IContainerContext extends IMessageScheduler, IDisposable {
     readonly storage: IDocumentStorageService | undefined | null;
     readonly connected: boolean;
     readonly branch: string;
-    readonly baseSnapshot: ISnapshotTree | null;
+    readonly baseSnapshot: ISnapshotTree | undefined;
     readonly submitFn: (type: MessageType, contents: any, batch: boolean, appData?: any) => number;
     readonly submitSignalFn: (contents: any) => void;
     readonly snapshotFn: (message: string) => Promise<void>;

packages/loader/container-loader/src/container.ts

@@ -55,6 +55,7 @@ import {
     isOnline,
     ensureFluidResolvedUrl,
     combineAppAndProtocolSummary,
+    readAndParseFromBlobs,
 } from "@fluidframework/driver-utils";
 import { CreateContainerError } from "@fluidframework/container-utils";
 import {
@@ -193,7 +194,8 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
         options: any,
         scope: IFluidObject,
         loader: Loader,
-        source: IFluidCodeDetails,
+        codeDetails: IFluidCodeDetails | undefined,
+        snapshot: ISnapshotTree | undefined,
         serviceFactory: IDocumentServiceFactory,
         urlResolver: IUrlResolver,
         logger?: ITelemetryBaseLogger,
@@ -207,7 +209,13 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
             urlResolver,
             {},
             logger);
-        await container.createDetached(source);
+
+        if (snapshot !== undefined) {
+            await container.createDetachedFromSnapshot(snapshot);
+        } else {
+            assert(codeDetails, "One of the source should be there to load from!!");
+            await container.createDetached(codeDetails);
+        }
 
         return container;
     }
@@ -564,8 +572,6 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
             this._attachState = AttachState.Attached;
             this.emit("attached");
             this.cachedAttachSummary = undefined;
-            // We know this is create new flow.
-            this._existing = false;
             this._parentBranch = this._id;
 
             // Propagate current connection state through the system.
@@ -1016,6 +1022,9 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
 
         this.attachDeltaManagerOpHandler(attributes);
 
+        // We know this is create detached flow without snapshot.
+        this._existing = false;
+
         // Need to just seed the source data in the code quorum. Quorum itself is empty
         this._protocolHandler = this.initializeProtocolState(
             attributes,
@@ -1031,6 +1040,26 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
         this.propagateConnectionState();
     }
 
+    private async createDetachedFromSnapshot(snapshotTree: ISnapshotTree) {
+        const attributes = await this.getDocumentAttributes(undefined, snapshotTree);
+        assert.strictEqual(attributes.sequenceNumber, 0, "Seq number in detached container should be 0!!");
+        this.attachDeltaManagerOpHandler(attributes);
+
+        // We know this is create detached flow with snapshot.
+        this._existing = true;
+
+        // ...load in the existing quorum
+        // Initialize the protocol handler
+        this._protocolHandler =
+            await this.loadAndInitializeProtocolState(attributes, undefined, snapshotTree);
+
+        await this.createDetachedContext(attributes, snapshotTree);
+
+        this.loaded = true;
+
+        this.propagateConnectionState();
+    }
+
     private async getDocumentStorageService(): Promise<IDocumentStorageService> {
         if (this.service === undefined) {
             throw new Error("Not attached");
@@ -1040,7 +1069,7 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
     }
 
     private async getDocumentAttributes(
-        storage: IDocumentStorageService,
+        storage: IDocumentStorageService | undefined,
         tree: ISnapshotTree | undefined,
     ): Promise<IDocumentAttributes> {
         if (tree === undefined) {
@@ -1057,7 +1086,8 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
             ? tree.trees[".protocol"].blobs.attributes
             : tree.blobs[".attributes"];
 
-        const attributes = await readAndParse<IDocumentAttributes>(storage, attributesHash);
+        const attributes = storage !== undefined ? await readAndParse<IDocumentAttributes>(storage, attributesHash)
+            : readAndParseFromBlobs<IDocumentAttributes>(tree.trees[".protocol"].blobs, attributesHash);
 
         // Back-compat for older summaries with no term
         if (attributes.term === undefined) {
@@ -1069,7 +1099,7 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
 
     private async loadAndInitializeProtocolState(
         attributes: IDocumentAttributes,
-        storage: IDocumentStorageService,
+        storage: IDocumentStorageService | undefined,
         snapshot: ISnapshotTree | undefined,
     ): Promise<ProtocolOpHandler> {
         let members: [string, ISequencedClient][] = [];
@@ -1078,11 +1108,20 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
 
         if (snapshot !== undefined) {
             const baseTree = ".protocol" in snapshot.trees ? snapshot.trees[".protocol"] : snapshot;
-            [members, proposals, values] = await Promise.all([
-                readAndParse<[string, ISequencedClient][]>(storage, baseTree.blobs.quorumMembers),
-                readAndParse<[number, ISequencedProposal, string[]][]>(storage, baseTree.blobs.quorumProposals),
-                readAndParse<[string, ICommittedProposal][]>(storage, baseTree.blobs.quorumValues),
-            ]);
+            if (storage !== undefined) {
+                [members, proposals, values] = await Promise.all([
+                    readAndParse<[string, ISequencedClient][]>(storage, baseTree.blobs.quorumMembers),
+                    readAndParse<[number, ISequencedProposal, string[]][]>(storage, baseTree.blobs.quorumProposals),
+                    readAndParse<[string, ICommittedProposal][]>(storage, baseTree.blobs.quorumValues),
+                ]);
+            } else {
+                members = readAndParseFromBlobs<[string, ISequencedClient][]>(snapshot.trees[".protocol"].blobs,
+                    baseTree.blobs.quorumMembers);
+                proposals = readAndParseFromBlobs<[number, ISequencedProposal, string[]][]>(
+                    snapshot.trees[".protocol"].blobs, baseTree.blobs.quorumProposals);
+                values = readAndParseFromBlobs<[string, ICommittedProposal][]>(snapshot.trees[".protocol"].blobs,
+                    baseTree.blobs.quorumValues);
+            }
         }
 
         const protocolHandler = this.initializeProtocolState(
@@ -1507,7 +1546,7 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
             this.scope,
             this.codeLoader,
             chaincode,
-            snapshot ?? null,
+            snapshot,
             attributes,
             this.blobManager,
             new DeltaManagerProxy(this._deltaManager),
@@ -1529,7 +1568,7 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
     /**
      * Creates a new, unattached container context
      */
-    private async createDetachedContext(attributes: IDocumentAttributes) {
+    private async createDetachedContext(attributes: IDocumentAttributes, snapshot?: ISnapshotTree) {
         this.pkg = this.getCodeDetailsFromQuorum();
         if (this.pkg === undefined) {
             throw new Error("pkg should be provided in create flow!!");
@@ -1545,7 +1584,7 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
             this.scope,
             this.codeLoader,
             runtimeFactory,
-            { id: null, blobs: {}, commits: {}, trees: {} },    // TODO this will be from the offline store
+            snapshot,
             attributes,
             this.blobManager,
             new DeltaManagerProxy(this._deltaManager),