Skip to content

(compat) Fix incorrect usages of storage service at Runtime and Loader layer #25722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agarwal-navin merged 1 commit into from
Oct 21, 2025
Merged

(compat) Fix incorrect usages of storage service at Runtime and Loader layer #25722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/loader/container-loader/src/container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import type {
ReadOnlyInfo,
ILoader,
ILoaderOptions,
IContainerStorageService,
} from "@fluidframework/container-definitions/internal";
import { isFluidCodeDetails } from "@fluidframework/container-definitions/internal";
import {
Expand All @@ -54,7 +55,6 @@ import {
import {
type IDocumentService,
type IDocumentServiceFactory,
type IDocumentStorageService,
type IResolvedUrl,
type ISnapshot,
type IThrottlingWarning,
Expand Down Expand Up @@ -1887,7 +1887,7 @@ export class Container

private async initializeProtocolStateFromSnapshot(
attributes: IDocumentAttributes,
storage: IDocumentStorageService,
storage: IContainerStorageService,
snapshot: ISnapshotTree | undefined,
): Promise<void> {
const quorumSnapshot: IQuorumSnapshot = {
Expand Down
10 changes: 5 additions & 5 deletions packages/runtime/container-runtime/src/test/containerRuntime.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
ContainerErrorTypes,
type IContainerContext,
type IBatchMessage,
type IContainerStorageService,
} from "@fluidframework/container-definitions/internal";
import type { IContainerRuntime } from "@fluidframework/container-runtime-definitions/internal";
import type {
Expand Down Expand Up @@ -58,7 +59,6 @@ import {
type IEnvelope,
type ITelemetryContext,
type ISummarizeInternalResult,
type IRuntimeStorageService,
} from "@fluidframework/runtime-definitions/internal";
import { defaultMinVersionForCollab } from "@fluidframework/runtime-utils/internal";
import {
Expand Down Expand Up @@ -242,7 +242,7 @@ describe("Runtime", () => {
const mockClientId = "mockClientId";

// Mock the storage layer so "submitSummary" works.
const defaultMockStorage: Partial<IRuntimeStorageService> = {
const defaultMockStorage: Partial<IContainerStorageService> = {
uploadSummaryWithContext: async (summary: ISummaryTree, context: ISummaryContext) => {
return "fakeHandle";
},
Expand All @@ -251,7 +251,7 @@ describe("Runtime", () => {
params: {
settings?: Record<string, ConfigTypes>;
logger?: ITelemetryBaseLogger;
mockStorage?: Partial<IRuntimeStorageService>;
mockStorage?: Partial<IContainerStorageService>;
loadedFromVersion?: IVersion;
baseSnapshot?: ISnapshotTree;
connected?: boolean;
Expand Down Expand Up @@ -298,7 +298,7 @@ describe("Runtime", () => {
},
clientId,
connected,
storage: mockStorage as IRuntimeStorageService,
storage: mockStorage as IContainerStorageService,
baseSnapshot,
} satisfies Partial<IContainerContext>;

Expand Down Expand Up @@ -2119,7 +2119,7 @@ describe("Runtime", () => {
summaryRefSeq: 100,
summaryLogger: createChildLogger({}),
};
class MockStorageService implements Partial<IRuntimeStorageService> {
class MockStorageService implements Partial<IContainerStorageService> {
/**
* This always returns the same snapshot. Basically, when container runtime receives an ack for the
* deleted snapshot and tries to fetch the latest snapshot, return the latest snapshot.
Expand Down
37 changes: 0 additions & 37 deletions packages/test/test-end-to-end-tests/src/test/deRehydrateContainerTests.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,43 +531,6 @@ describeCompat(
assert.strictEqual(sparseMatrix.id, sparseMatrixId, "Sparse matrix should exist!!");
});

it("Storage in detached container", async () => {
const { container } = await createDetachedContainerAndGetEntryPoint();

const snapshotTree = container.serialize();
const defaultDataStore =
await getContainerEntryPointBackCompat<TestFluidObject>(container);
assert(
defaultDataStore.context.storage !== undefined,
"Storage should be present in detached data store",
);
let success1: boolean | undefined;
await defaultDataStore.context.storage.getSnapshotTree(undefined).catch((err) => {
success1 = false;
});
assert(
success1 === false,
"Snapshot fetch should not be allowed in detached data store",
);

const container2: IContainer =
await loader.rehydrateDetachedContainerFromSnapshot(snapshotTree);
const defaultDataStore2 =
await getContainerEntryPointBackCompat<TestFluidObject>(container2);
assert(
defaultDataStore2.context.storage !== undefined,
"Storage should be present in rehydrated data store",
);
let success2: boolean | undefined;
await defaultDataStore2.context.storage.getSnapshotTree(undefined).catch((err) => {
success2 = false;
});
assert(
success2 === false,
"Snapshot fetch should not be allowed in rehydrated data store",
);
});

it("Change contents of dds, then rehydrate and then check summary", async () => {
const { container } = await createDetachedContainerAndGetEntryPoint();

Expand Down
Loading