sliftutils 1.7.90 → 1.7.91

package/storage/remoteStorage/storageServerState.d.ts

@@ -1,38 +1,17 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { BlobStore } from "./blobStore";
-import { RemoteConfig, HostedConfig, SourceConfig, IArchives, ArchivesConfig, ArchivesSyncStatus } from "../IArchives";
+import { RemoteConfig, SourceConfig, IArchives, ArchivesConfig, ArchivesSyncStatus } from "../IArchives";
 import { BucketDiskInfo } from "./bucketDisk";
-import { SelfSummary } from "./storePlan";
-/**
- * What this server HAS, as opposed to what any of it does. Four things, and nothing else:
- *
- * - the stores, by folder (getStore) - made once, and self-configuring from there
- * - which of them a request means (findBucketStore), which is only ever a name
- * - what exists on disk, for listings and for the pages that report it
- *
- * It decides nothing about routes, windows or peers - a store reads its own config and works that
- * out itself (BlobStore.applyRoutingConfig) - and it schedules nothing: switchovers and the handovers
- * they cause live in intermediateManagement.
- */
-export type LoadedStore = {
-    name: string;
-    entries: HostedConfig[];
-    folder: string;
-    store: BlobStore;
-};
-export type BucketState = {
-    account: string;
-    bucketName: string;
-    routing?: RemoteConfig;
-    selfEntries: HostedConfig[];
-    self: SelfSummary | undefined;
-    stores: LoadedStore[];
-};
-/** The loaded bucket, loading it (which instantiates its stores and starts their synchronization) if needed. A bucket that does not exist on this server throws - callers never see undefined buckets. */
-export declare function requireBucket(account: string, bucketName: string): Promise<BucketState>;
+import { BucketWriteStats } from "./accessStats";
+export declare function getStore(account: string, bucketName: string, name: string): BlobStore;
 /** The store serving a request: the one the client's selected entry NAMES. Account, name, and bucket ARE the folder, so this is a direct lookup, never a search of what exists - and a name this server has never seen is CREATED, never rejected, because asking for a name is the instruction to have that store (one name, one folder, one index; it configures itself once the routing config lands in it). Nothing else about the request is compared - not the window, not the route, not the flags - which is the whole point of naming it: a client a config version behind on some flag still reaches the right store. */
 export declare function findBucketStore(account: string, bucketName: string, sourceConfig: SourceConfig | undefined): BlobStore;
+/** The stores of a bucket as the DISK records them (a bucket is nothing more than the store folders sharing its name), opened - so the ones that weren't running yet start synchronizing. Empty when the bucket does not exist here. */
+export declare function getBucketStores(account: string, bucketName: string): Promise<{
+    name: string;
+    store: BlobStore;
+}[]>;
 /** Internal (store-to-store) reads skip store selection entirely: the caller is another store whose index says this MACHINE holds the bytes - the persisted holder identity is just a URL, which cannot name a store. Whichever store's folder has the newest copy answers. */
 export declare function readBucketInternal(account: string, bucketName: string, config: {
     path: string;
@@ -46,9 +25,9 @@ export declare function readBucketInternal(account: string, bucketName: string,
     writeTime: number;
     size: number;
 } | undefined>;
-export declare function getBucketConfig(bucket: BucketState): ArchivesConfig;
-export declare function bucketSyncStatus(bucket: BucketState): Promise<ArchivesSyncStatus>;
-export declare function debugBucketIndexTotals(bucket: BucketState): Promise<{
+export declare function getBucketArchivesConfig(account: string, bucketName: string): Promise<ArchivesConfig>;
+export declare function bucketSyncStatus(account: string, bucketName: string): Promise<ArchivesSyncStatus>;
+export declare function debugBucketIndexTotals(account: string, bucketName: string): Promise<{
     fileCount: number;
     byteCount: number;
     sources: {
@@ -57,14 +36,8 @@ export declare function debugBucketIndexTotals(bucket: BucketState): Promise<{
         byteCount: number;
     }[];
 }>;
-/** The bucket states currently in memory - what the switchover machinery walks. Only what is loaded: loading a bucket starts its synchronization, and a bucket nothing has touched has no in-flight writes to hand over anyway. */
-export declare function getBucketStates(): BucketState[];
 /** A cached IArchives for a persisted source identity: a routing URL (hosted/backblaze) or a disk folder path - the form BlobStore's sources list stores. Configuration (valid windows, routes) decides WHEN a source should be used; for reading bytes the index says a source holds, the URL alone is enough - even for sources no longer in any config. */
 export declare function resolveSourceArchives(url: string): IArchives;
-export declare function getStore(account: string, bucketName: string, name: string): BlobStore;
-export declare function getLoadedBucket(account: string, bucketName: string): Promise<BucketState | undefined>;
-/** Re-reads the bucket off the disk, replacing the cached snapshot: what a routing-config write calls, because that write can CREATE a store (a new name gets a new folder) and the snapshot would keep answering with the stores it saw at load time. Existing stores are reused (getStore caches by folder), so this only picks up folder changes - it never restarts a store. */
-export declare function reloadBucket(account: string, bucketName: string): Promise<BucketState | undefined>;
 /**
  * Writing the routing config is a write like any other: it goes into a store, and the store applies
  * it to itself and lets its peers pull it. The only thing that happens here is picking WHICH store,
@@ -77,7 +50,7 @@ export declare function reloadBucket(account: string, bucketName: string): Promi
 export declare function writeRoutingConfig(account: string, bucketName: string, name: string, data: Buffer, config?: {
     lastModified?: number;
 }): Promise<void>;
-/** Which buckets this process currently has loaded - what a deploy successor asks its predecessor for, so it activates exactly the buckets that are actually in use. */
+/** Which buckets this process currently has active (some store of theirs was opened) - what a deploy successor asks its predecessor for, so it activates exactly the buckets that are actually in use. */
 export declare function getActiveBucketKeys(): {
     account: string;
     bucketName: string;
@@ -96,25 +69,12 @@ export type ServerBucketInfo = {
 };
 export type ActiveBucketInfo = {
     folder: string;
-    /** The routing config the bucket is RUNNING on, straight from memory - including switchover windows written since it loaded. Absent when none of its stores has one yet. */
+    /** The bucket's routing config, the newest copy among its stores. Absent when none of them has one yet. */
     routing?: RemoteConfig;
-    /** Our own entries in that config, and their summarized current role (routes union + flags) */
-    selfEntries: HostedConfig[];
-    self?: SelfSummary;
     config: ArchivesConfig;
 };
-/** The live in-memory state of ONE bucket, answered without touching the disk (no routing file read, no statfs, no stored write stats). Returns an error string when the bucket is not loaded here, which is the normal state for a bucket nothing has accessed since startup. */
+/** The state of ONE active bucket. Returns an error string when the bucket is not active here, which is the normal state for a bucket nothing has accessed since startup. */
 export declare function debugGetActiveBucket(account: string, bucketName: string): Promise<ActiveBucketInfo | string>;
-/** Loads a bucket that exists on this server's disk into memory, which starts its synchronization and window timers, and returns its live state. Nothing is written and no other server is contacted - unlike building an ArchivesChain for it, which would probe every source and could write the routing config. Already-loaded buckets just return their state. */
+/** Loads every store of a bucket that exists on this server's disk into memory, which starts their synchronization and window timers, and returns the bucket's state. Nothing is written and no other server is contacted - unlike building an ArchivesChain for it, which would probe every source and could write the routing config. Already-active buckets just return their state. */
 export declare function activateBucket(account: string, bucketName: string): Promise<ActiveBucketInfo | string>;
 export declare function debugListAccountBuckets(account: string): Promise<ServerBucketInfo[]>;
-export type BucketWriteStats = {
-    /** Every set call the bucket accepted */
-    originalWrites: number;
-    originalBytes: number;
-    /** What actually reached the sources. Fast writes coalesce repeated writes to the same key, so this is lower than the original counts (and is what the disk actually did). */
-    flushedWrites: number;
-    flushedBytes: number;
-};
-/** Zeroes the write statistics of every bucket in the account. */
-export declare function debugClearAccountWriteStats(account: string): number;

package/storage/remoteStorage/storageServerState.ts

@@ -1,57 +1,61 @@
-import path from "path";
-import fs from "fs";
 import { BlobStore } from "./blobStore";
 import {
-    RemoteConfig, HostedConfig, SourceConfig, IArchives, ArchivesConfig, ArchivesSyncStatus, SyncActivity,
+    RemoteConfig, SourceConfig, IArchives, ArchivesConfig, ArchivesSyncStatus, SyncActivity,
 } from "../IArchives";
 import { ROUTING_FILE, parseRoutingData, serializeRemoteConfig, normalizeSource } from "./remoteConfig";
 import { createStoreSource, applySourceConfig } from "./storeSources";
 import { broadcastRoutingChanged } from "./storageController";
-import { getStorageServerConfig, assertWritesAllowed } from "./serverConfig";
+import { assertWritesAllowed } from "./serverConfig";
 import { assertValidSourceName } from "./validation";
 import { getBucketFolder, listAccountStoreFolders, listBucketStoreFolders, readRoutingFromDisk, getDiskInfo, BucketDiskInfo } from "./bucketDisk";
 import { scheduleBoundaryWork, reinjectIntermediates } from "./intermediateManagement";
-import { planSelfStores, isSelfSource, SelfSummary } from "./storePlan";
+import { isSelfSource } from "./storePlan";
+import { countBucketWrite, getBucketWriteStats, BucketWriteStats } from "./accessStats";
 
 /**
- * What this server HAS, as opposed to what any of it does. Four things, and nothing else:
- *
- * - the stores, by folder (getStore) - made once, and self-configuring from there
- * - which of them a request means (findBucketStore), which is only ever a name
- * - what exists on disk, for listings and for the pages that report it
- *
- * It decides nothing about routes, windows or peers - a store reads its own config and works that
- * out itself (BlobStore.applyRoutingConfig) - and it schedules nothing: switchovers and the handovers
- * they cause live in intermediateManagement.
+ * What this server HAS: the stores, by name (getStore) - made once, self-configuring from there -
+ * and the three entry points a request resolves through (findBucketStore, readBucketInternal,
+ * writeRoutingConfig). There is no cached bucket state: a bucket is nothing but the stores whose
+ * folders share its name, listed off the disk when something genuinely needs all of them.
  */
 
-export type LoadedStore = {
-    // The name its entries gave it (see CommonConfig.name) - its identity here, its folder on disk, and how a request finds it
-    name: string;
-    // The exact self entries this store serves (same route, different valid windows). Empty when we are not in the config but still serve our disk data.
-    entries: HostedConfig[];
-    folder: string;
-    store: BlobStore;
-};
-
-// A bucket loaded on this server: the stores it has here, and what the newest of their configs says about us. Pure data - the stores themselves do the work, including configuring themselves.
-export type BucketState = {
-    account: string;
-    bucketName: string;
-    // The newest routing config among its stores, or absent when none of them has one yet
-    routing?: RemoteConfig;
-    selfEntries: HostedConfig[];
-    self: SelfSummary | undefined;
-    stores: LoadedStore[];
-};
+/**
+ * Every store this process runs, by folder - which IS the store's identity: account, name, bucket.
+ * A store is made once, configures itself from the routing config it holds, and stays; nothing here
+ * decides what it is, only that it exists.
+ */
+const stores = new Map<string, BlobStore>();
+// The opened stores of each `${account}/${bucketName}`, by name - which buckets are ACTIVE (something touched them), for deploy handoffs and the debug pages. Purely a registry of what getStore already made.
+const activeStores = new Map<string, Map<string, BlobStore>>();
 
-/** The loaded bucket, loading it (which instantiates its stores and starts their synchronization) if needed. A bucket that does not exist on this server throws - callers never see undefined buckets. */
-export async function requireBucket(account: string, bucketName: string): Promise<BucketState> {
-    let bucket = await getLoadedBucket(account, bucketName);
-    if (!bucket) {
-        throw new Error(`Bucket ${account}/${bucketName} does not exist on this server. Write its routing config to ${JSON.stringify(ROUTING_FILE)} to create it.`);
+export function getStore(account: string, bucketName: string, name: string): BlobStore {
+    // The one place a name becomes a folder, so the one place it is validated (it can come straight off the wire)
+    assertValidSourceName(name);
+    let folder = getBucketFolder(name, account, bucketName);
+    let existing = stores.get(folder);
+    if (existing) return existing;
+    console.log(`Opening store ${JSON.stringify(name)} of bucket ${account}/${bucketName} (folder ${folder}) - created on this first use if it never existed`);
+    let store = new BlobStore(folder, name, {
+        // Which entries in ITS routing config are this server's copy of it
+        isSelf: source => isSelfSource(source, account, bucketName),
+        createSource: config => createStoreSource({ sourceConfig: config.sourceConfig, folder, writeDelay: config.writeDelay }),
+        applySource: (source, sourceConfig, writeDelay) => applySourceConfig(source, sourceConfig, writeDelay),
+        onWriteCounted: (kind, bytes) => countBucketWrite(`${account}/${bucketName}`, kind, bytes),
+        resolveSourceUrl: resolveSourceArchives,
+        // The store is the one that knows when a config landed, and a config with upcoming windows is what boundary scans are armed from
+        onRoutingApplied: routing => scheduleBoundaryWork(account, bucketName, routing),
+    });
+    stores.set(folder, store);
+    let key = `${account}/${bucketName}`;
+    let byName = activeStores.get(key);
+    if (!byName) {
+        byName = new Map();
+        activeStores.set(key, byName);
     }
-    return bucket;
+    byName.set(name, store);
+    // Lazy init would leave a store nothing has touched sitting inert - no index loaded, no config applied, nothing synchronizing - while its folder is full of files
+    void store.init().catch((e: Error) => console.error(`Initializing store ${JSON.stringify(name)} of bucket ${account}/${bucketName} failed: ${e.stack ?? e}`));
+    return store;
 }
 
 /** The store serving a request: the one the client's selected entry NAMES. Account, name, and bucket ARE the folder, so this is a direct lookup, never a search of what exists - and a name this server has never seen is CREATED, never rejected, because asking for a name is the instruction to have that store (one name, one folder, one index; it configures itself once the routing config lands in it). Nothing else about the request is compared - not the window, not the route, not the flags - which is the whole point of naming it: a client a config version behind on some flag still reaches the right store. */
@@ -59,15 +63,27 @@ export function findBucketStore(account: string, bucketName: string, sourceConfi
     if (!sourceConfig) {
         throw new Error(`No remote source configuration was provided for bucket ${account}/${bucketName}: every request must say which configured source it selected`);
     }
-    // Not part of resolving the request (the name already says everything): loading the bucket is what schedules its switchover work and marks it active for deploy handoffs, and a bucket serving requests must be loaded
-    void getLoadedBucket(account, bucketName).catch((e: Error) => console.error(`Loading bucket ${account}/${bucketName} failed: ${e.stack ?? e}`));
     return getStore(account, bucketName, sourceConfig.name);
 }
 
+/** The stores of a bucket as the DISK records them (a bucket is nothing more than the store folders sharing its name), opened - so the ones that weren't running yet start synchronizing. Empty when the bucket does not exist here. */
+export async function getBucketStores(account: string, bucketName: string): Promise<{ name: string; store: BlobStore }[]> {
+    let folders = await listBucketStoreFolders(account, bucketName);
+    return folders.map(x => ({ name: x.name, store: getStore(account, bucketName, x.name) }));
+}
+
+async function requireBucketStores(account: string, bucketName: string): Promise<{ name: string; store: BlobStore }[]> {
+    let list = await getBucketStores(account, bucketName);
+    if (!list.length) {
+        throw new Error(`Bucket ${account}/${bucketName} does not exist on this server. Write its routing config to ${JSON.stringify(ROUTING_FILE)} to create it.`);
+    }
+    return list;
+}
+
 /** Internal (store-to-store) reads skip store selection entirely: the caller is another store whose index says this MACHINE holds the bytes - the persisted holder identity is just a URL, which cannot name a store. Whichever store's folder has the newest copy answers. */
 export async function readBucketInternal(account: string, bucketName: string, config: { path: string; range?: { start: number; end: number }; includeTombstones?: boolean }): Promise<{ data: Buffer; writeTime: number; size: number } | undefined> {
-    let bucket = await requireBucket(account, bucketName);
-    let results = await Promise.all(bucket.stores.map(s => s.store.get2({ path: config.path, range: config.range, includeTombstones: config.includeTombstones, internal: true })));
+    let bucketStores = await requireBucketStores(account, bucketName);
+    let results = await Promise.all(bucketStores.map(s => s.store.get2({ path: config.path, range: config.range, includeTombstones: config.includeTombstones, internal: true })));
     let best: { data: Buffer; writeTime: number; size: number } | undefined;
     for (let result of results) {
         if (result && (!best || result.writeTime > best.writeTime)) {
@@ -77,13 +93,13 @@ export async function readBucketInternal(account: string, bucketName: string, co
     return best;
 }
 
-export function getBucketConfig(bucket: BucketState): ArchivesConfig {
+function aggregateArchivesConfig(bucketStores: BlobStore[], routing: RemoteConfig | undefined): ArchivesConfig {
     let index = { fileCount: 0, byteCount: 0 };
     let indexSources: { debugName: string; fileCount: number; byteCount: number }[] = [];
     let syncing: SyncActivity[] = [];
     let readerDiskLimit: number | undefined;
-    for (let s of bucket.stores) {
-        let progress = s.store.getSyncProgress();
+    for (let store of bucketStores) {
+        let progress = store.getSyncProgress();
         index.fileCount += progress.index.fileCount;
         index.byteCount += progress.index.byteCount;
         indexSources.push(...progress.sources);
@@ -93,7 +109,7 @@ export function getBucketConfig(bucket: BucketState): ArchivesConfig {
     return {
         // Every store is index-backed, so the change feed is always native
         supportsChangesAfter: true,
-        remoteConfig: bucket.routing,
+        remoteConfig: routing,
         index,
         indexSources,
         readerDiskLimit,
@@ -101,8 +117,15 @@ export function getBucketConfig(bucket: BucketState): ArchivesConfig {
     };
 }
 
-export async function bucketSyncStatus(bucket: BucketState): Promise<ArchivesSyncStatus> {
-    let statuses = await Promise.all(bucket.stores.map(s => s.store.getSyncStatus()));
+export async function getBucketArchivesConfig(account: string, bucketName: string): Promise<ArchivesConfig> {
+    let bucketStores = await requireBucketStores(account, bucketName);
+    let routing = await readRoutingFromDisk(account, bucketName);
+    return aggregateArchivesConfig(bucketStores.map(x => x.store), routing);
+}
+
+export async function bucketSyncStatus(account: string, bucketName: string): Promise<ArchivesSyncStatus> {
+    let bucketStores = await requireBucketStores(account, bucketName);
+    let statuses = await Promise.all(bucketStores.map(s => s.store.getSyncStatus()));
     return {
         allScansComplete: statuses.every(x => x.allScansComplete),
         indexSize: statuses.reduce((sum, x) => sum + x.indexSize, 0),
@@ -110,8 +133,9 @@ export async function bucketSyncStatus(bucket: BucketState): Promise<ArchivesSyn
     };
 }
 
-export async function debugBucketIndexTotals(bucket: BucketState): Promise<{ fileCount: number; byteCount: number; sources: { debugName: string; fileCount: number; byteCount: number }[] }> {
-    let totals = await Promise.all(bucket.stores.map(s => s.store.computeIndexTotals()));
+export async function debugBucketIndexTotals(account: string, bucketName: string): Promise<{ fileCount: number; byteCount: number; sources: { debugName: string; fileCount: number; byteCount: number }[] }> {
+    let bucketStores = await requireBucketStores(account, bucketName);
+    let totals = await Promise.all(bucketStores.map(s => s.store.computeIndexTotals()));
     return {
         fileCount: totals.reduce((sum, x) => sum + x.fileCount, 0),
         byteCount: totals.reduce((sum, x) => sum + x.byteCount, 0),
@@ -119,15 +143,6 @@ export async function debugBucketIndexTotals(bucket: BucketState): Promise<{ fil
     };
 }
 
-const buckets = new Map<string, Promise<BucketState | undefined>>();
-// The resolved ones, for the code that walks buckets rather than asking for one (see getBucketStates)
-const loadedBuckets = new Map<string, BucketState>();
-
-/** The bucket states currently in memory - what the switchover machinery walks. Only what is loaded: loading a bucket starts its synchronization, and a bucket nothing has touched has no in-flight writes to hand over anyway. */
-export function getBucketStates(): BucketState[] {
-    return [...loadedBuckets.values()];
-}
-
 const resolvedSourceArchives = new Map<string, IArchives>();
 /** A cached IArchives for a persisted source identity: a routing URL (hosted/backblaze) or a disk folder path - the form BlobStore's sources list stores. Configuration (valid windows, routes) decides WHEN a source should be used; for reading bytes the index says a source holds, the URL alone is enough - even for sources no longer in any config. */
 export function resolveSourceArchives(url: string): IArchives {
@@ -143,91 +158,6 @@ export function resolveSourceArchives(url: string): IArchives {
     return archives;
 }
 
-/** What an index entry records as the holder of its bytes (see ArchivesSource.url), so it must name the endpoint FOREVER. An intermediate is a switchover's temporary alternate port onto another source, and that port is gone for good once its window passes - so it is recorded as the source it was split out of, which holds the same bucket and outlives it. */
-function sourcePersistentUrl(sourceConfig: SourceConfig | undefined, folder: string): string {
-    if (!sourceConfig) return folder;
-    return sourceConfig.intermediate || sourceConfig.url;
-}
-
-/** The fast-write policy this store writes under: its own configuration decides it (fast/writeDelay are OUR settings, not the peer's), and each source then holds writes for as long as sourceWriteDelay says. */
-/**
- * Every store this process runs, by folder - which IS the store's identity: account, name, bucket.
- * A store is made once, configures itself from the routing config it holds, and stays; nothing here
- * decides what it is, only that it exists.
- */
-const stores = new Map<string, BlobStore>();
-
-export function getStore(account: string, bucketName: string, name: string): BlobStore {
-    // The one place a name becomes a folder, so the one place it is validated (it can come straight off the wire)
-    assertValidSourceName(name);
-    let folder = getBucketFolder(name, account, bucketName);
-    let existing = stores.get(folder);
-    if (existing) return existing;
-    console.log(`Opening store ${JSON.stringify(name)} of bucket ${account}/${bucketName} (folder ${folder}) - created on this first use if it never existed`);
-    let store = new BlobStore(folder, name, {
-        // Which entries in ITS routing config are this server's copy of it
-        isSelf: source => isSelfSource(source, account, bucketName),
-        createSource: config => createStoreSource({ sourceConfig: config.sourceConfig, folder, writeDelay: config.writeDelay }),
-        applySource: (source, sourceConfig, writeDelay) => applySourceConfig(source, sourceConfig, writeDelay),
-        onWriteCounted: (kind, bytes) => countBucketWrite(`${account}/${bucketName}`, kind, bytes),
-        resolveSourceUrl: resolveSourceArchives,
-    });
-    stores.set(folder, store);
-    // Lazy init would leave a store nothing has touched sitting inert - no index loaded, no config applied, nothing synchronizing - while its folder is full of files
-    void store.init().catch((e: Error) => console.error(`Initializing store ${JSON.stringify(name)} of bucket ${account}/${bucketName} failed: ${e.stack ?? e}`));
-    return store;
-}
-
-/** The bucket as this server has it: the stores whose folders exist, plus whatever the newest of their configs says about us. Names come from the DISK, not from the config - a store we hold keeps being served whether or not the current config still mentions it. */
-function buildBucket(account: string, bucketName: string, names: string[], routing: RemoteConfig | undefined): BucketState {
-    let plan = routing && planSelfStores(account, bucketName, routing) || undefined;
-    let entriesByName = new Map<string, HostedConfig[]>();
-    for (let selfStore of plan?.stores || []) {
-        entriesByName.set(selfStore.name, selfStore.entries);
-    }
-    // Each store reads its own copy of the config and decides what it is - see BlobStore.applyRoutingConfig. Nothing here configures anything.
-    let stores: LoadedStore[] = names.map(name => ({
-        name,
-        entries: entriesByName.get(name) || [],
-        folder: getBucketFolder(name, account, bucketName),
-        store: getStore(account, bucketName, name),
-    }));
-    let loaded: BucketState = { account, bucketName, routing, selfEntries: plan?.selfEntries || [], self: plan?.self, stores };
-    loadedBuckets.set(`${account}/${bucketName}`, loaded);
-    scheduleBoundaryWork(loaded);
-    return loaded;
-}
-
-// A bucket exists here when it has at least one store folder - the disk IS the record. Its config is the newest copy among those stores; with none at all it has no config yet, which is a perfectly good state for a store nobody has configured.
-async function loadBucket(account: string, bucketName: string): Promise<BucketState | undefined> {
-    let folders = await listBucketStoreFolders(account, bucketName);
-    if (!folders.length) return undefined;
-    let routing = await readRoutingFromDisk(account, bucketName);
-    return buildBucket(account, bucketName, folders.map(x => x.name), routing);
-}
-
-export function getLoadedBucket(account: string, bucketName: string): Promise<BucketState | undefined> {
-    let key = `${account}/${bucketName}`;
-    return buckets.get(key) || reloadBucket(account, bucketName);
-}
-
-/** Re-reads the bucket off the disk, replacing the cached snapshot: what a routing-config write calls, because that write can CREATE a store (a new name gets a new folder) and the snapshot would keep answering with the stores it saw at load time. Existing stores are reused (getStore caches by folder), so this only picks up folder changes - it never restarts a store. */
-export async function reloadBucket(account: string, bucketName: string): Promise<BucketState | undefined> {
-    let key = `${account}/${bucketName}`;
-    let loaded = loadBucket(account, bucketName);
-    buckets.set(key, loaded);
-    void loaded.then(bucket => {
-        if (!bucket && buckets.get(key) === loaded) {
-            buckets.delete(key);
-        }
-    }, () => {
-        if (buckets.get(key) === loaded) {
-            buckets.delete(key);
-        }
-    });
-    return await loaded;
-}
-
 /**
  * Writing the routing config is a write like any other: it goes into a store, and the store applies
  * it to itself and lets its peers pull it. The only thing that happens here is picking WHICH store,
@@ -241,17 +171,15 @@ export async function writeRoutingConfig(account: string, bucketName: string, na
     assertWritesAllowed();
     let store = getStore(account, bucketName, name);
     let incoming = parseRoutingData(data);
-    let current = (await getLoadedBucket(account, bucketName))?.routing;
+    let current = await readRoutingFromDisk(account, bucketName);
     let stored = reinjectIntermediates(current, incoming);
     await store.set({ path: ROUTING_FILE, data: Buffer.from(serializeRemoteConfig(stored)), lastModified: config?.lastModified });
-    // The write may have CREATED the store (a new name gets a new folder), and the loaded bucket is a snapshot of the disk - so it is re-read, or every data write naming the new store is rejected until a restart
-    await reloadBucket(account, bucketName);
     broadcastRoutingChanged();
 }
 
-/** Which buckets this process currently has loaded - what a deploy successor asks its predecessor for, so it activates exactly the buckets that are actually in use. */
+/** Which buckets this process currently has active (some store of theirs was opened) - what a deploy successor asks its predecessor for, so it activates exactly the buckets that are actually in use. */
 export function getActiveBucketKeys(): { account: string; bucketName: string }[] {
-    return [...buckets.keys()].map(key => {
+    return [...activeStores.keys()].map(key => {
         let slash = key.indexOf("/");
         return { account: key.slice(0, slash), bucketName: key.slice(slash + 1) };
     });
@@ -272,80 +200,46 @@ export type ServerBucketInfo = {
 
 export type ActiveBucketInfo = {
     folder: string;
-    /** The routing config the bucket is RUNNING on, straight from memory - including switchover windows written since it loaded. Absent when none of its stores has one yet. */
+    /** The bucket's routing config, the newest copy among its stores. Absent when none of them has one yet. */
     routing?: RemoteConfig;
-    /** Our own entries in that config, and their summarized current role (routes union + flags) */
-    selfEntries: HostedConfig[];
-    self?: SelfSummary;
     config: ArchivesConfig;
 };
 
-function toActiveBucketInfo(loaded: BucketState): ActiveBucketInfo {
-    return {
-        // One of its stores' folders - a bucket no longer has a folder of its own, it has one per store
-        folder: loaded.stores[0]?.folder || "",
-        routing: loaded.routing,
-        selfEntries: loaded.selfEntries,
-        self: loaded.self,
-        config: getBucketConfig(loaded),
-    };
-}
-
-/** The live in-memory state of ONE bucket, answered without touching the disk (no routing file read, no statfs, no stored write stats). Returns an error string when the bucket is not loaded here, which is the normal state for a bucket nothing has accessed since startup. */
+/** The state of ONE active bucket. Returns an error string when the bucket is not active here, which is the normal state for a bucket nothing has accessed since startup. */
 export async function debugGetActiveBucket(account: string, bucketName: string): Promise<ActiveBucketInfo | string> {
     let key = `${account}/${bucketName}`;
-    let loadedPromise = buckets.get(key);
-    if (!loadedPromise) {
-        return `Bucket ${key} is not loaded on this server, so it has no live state (it loads on first access)`;
-    }
-    let loaded: BucketState | undefined;
-    try {
-        loaded = await loadedPromise;
-    } catch (e) {
-        return `Bucket ${key} failed to load on this server: ${String((e as Error).stack ?? e).slice(0, 500)}`;
-    }
-    if (!loaded) {
-        return `Bucket ${key} does not exist on this server`;
+    let opened = activeStores.get(key);
+    if (!opened || !opened.size) {
+        return `Bucket ${key} is not active on this server (a bucket activates on first access)`;
     }
-    return toActiveBucketInfo(loaded);
+    let bucketStores = [...opened.values()];
+    let routing = await readRoutingFromDisk(account, bucketName);
+    return { folder: bucketStores[0].folder, routing, config: aggregateArchivesConfig(bucketStores, routing) };
 }
 
-/** Loads a bucket that exists on this server's disk into memory, which starts its synchronization and window timers, and returns its live state. Nothing is written and no other server is contacted - unlike building an ArchivesChain for it, which would probe every source and could write the routing config. Already-loaded buckets just return their state. */
+/** Loads every store of a bucket that exists on this server's disk into memory, which starts their synchronization and window timers, and returns the bucket's state. Nothing is written and no other server is contacted - unlike building an ArchivesChain for it, which would probe every source and could write the routing config. Already-active buckets just return their state. */
 export async function activateBucket(account: string, bucketName: string): Promise<ActiveBucketInfo | string> {
     let key = `${account}/${bucketName}`;
-    let wasLoaded = buckets.has(key);
-    let loaded: BucketState | undefined;
-    try {
-        loaded = await getLoadedBucket(account, bucketName);
-    } catch (e) {
-        return `Bucket ${key} failed to load on this server: ${String((e as Error).stack ?? e).slice(0, 500)}`;
-    }
-    if (!loaded) {
+    let wasActive = activeStores.has(key);
+    let bucketStores = await getBucketStores(account, bucketName);
+    if (!bucketStores.length) {
         return `Bucket ${key} does not exist on this server (it has no store folders under ${getBucketFolder("<name>", account, bucketName)})`;
     }
     // Wait for the indexes to load, so the totals we return are the real ones rather than zeroes from stores that have not read their index yet. The source scans keep running in the background.
-    for (let s of loaded.stores) {
+    for (let s of bucketStores) {
         await s.store.init();
     }
-    if (!wasLoaded) {
-        console.log(`Activated bucket ${key} on request: it is now loaded and synchronizing`);
+    if (!wasActive) {
+        console.log(`Activated bucket ${key} on request: its ${bucketStores.length} store(s) are now loaded and synchronizing`);
     }
-    return toActiveBucketInfo(loaded);
+    let routing = await readRoutingFromDisk(account, bucketName);
+    return { folder: bucketStores[0].store.folder, routing, config: aggregateArchivesConfig(bucketStores.map(x => x.store), routing) };
 }
 
 export async function debugListAccountBuckets(account: string): Promise<ServerBucketInfo[]> {
     let start = Date.now();
-    let timings = new Map<string, number>();
-    async function timed<T>(name: string, run: () => Promise<T>): Promise<T> {
-        let began = Date.now();
-        try {
-            return await run();
-        } finally {
-            timings.set(name, (timings.get(name) || 0) + (Date.now() - began));
-        }
-    }
     // The disk is the record: a bucket exists here when it has at least one store folder, and several names for one bucket are still one bucket
-    let folders = await timed("readdir", () => listAccountStoreFolders(account));
+    let folders = await listAccountStoreFolders(account);
     let byBucket = new Map<string, string>();
     for (let store of folders) {
         if (byBucket.has(store.bucketName)) continue;
@@ -356,83 +250,27 @@ export async function debugListAccountBuckets(account: string): Promise<ServerBu
         return await Promise.all(names.map(async bucketName => {
             let key = `${account}/${bucketName}`;
             let folder = byBucket.get(bucketName) || "";
-            let base: ServerBucketInfo = { bucketName, active: false, folder };
-            base.disk = await timed("statfs", () => getDiskInfo(folder)).catch((e: Error) => {
+            let base: ServerBucketInfo = { bucketName, active: activeStores.has(key), folder };
+            base.disk = await getDiskInfo(folder).catch((e: Error) => {
                 base.diskError = String(e.stack ?? e).slice(0, 500);
                 return undefined;
             });
             base.writeStats = getBucketWriteStats(key);
-            const loadedPromise = buckets.get(key);
-            if (loadedPromise) {
-                try {
-                    let loaded = await timed("awaitLoaded", () => loadedPromise);
-                    if (loaded) {
-                        return { ...base, active: true, config: getBucketConfig(loaded) };
-                    }
-                } catch (e) {
-                    return { ...base, active: true, error: String((e as Error).stack ?? e).slice(0, 500) };
-                }
-            }
             try {
-                const parsed = await timed("readRoutingFile", () => readRoutingFromDisk(account, bucketName));
-                if (!parsed) {
+                let routing = await readRoutingFromDisk(account, bucketName);
+                if (base.active) {
+                    let opened = [...(activeStores.get(key)?.values() || [])];
+                    return { ...base, config: aggregateArchivesConfig(opened, routing) };
+                }
+                if (!routing) {
                     return { ...base, error: `No routing file (${ROUTING_FILE}) in any of its stores` };
                 }
-                return { ...base, config: { remoteConfig: parsed } };
+                return { ...base, config: { remoteConfig: routing } };
             } catch (e) {
                 return { ...base, error: String((e as Error).stack ?? e).slice(0, 500) };
             }
         }));
     } finally {
-        // The parts run concurrently, so these are summed wall times per part, not a breakdown of the total
-        let parts = [...timings].map(([name, ms]) => `${name} ${ms}ms`).join(", ");
-        console.log(`debugListAccountBuckets(${account}) took ${Date.now() - start}ms for ${names.length} buckets: ${parts}`);
-    }
-}
-
-export type BucketWriteStats = {
-    /** Every set call the bucket accepted */
-    originalWrites: number;
-    originalBytes: number;
-    /** What actually reached the sources. Fast writes coalesce repeated writes to the same key, so this is lower than the original counts (and is what the disk actually did). */
-    flushedWrites: number;
-    flushedBytes: number;
-};
-function emptyWriteStats(): BucketWriteStats {
-    return { originalWrites: 0, originalBytes: 0, flushedWrites: 0, flushedBytes: 0 };
-}
-
-// In memory only: totals since this process started (or the last clearWriteStats). Persisting them to disk was more machinery than the numbers were worth.
-const writeStats = new Map<string, BucketWriteStats>();
-
-function countBucketWrite(key: string, kind: "original" | "flushed", bytes: number): void {
-    let stats = writeStats.get(key);
-    if (!stats) {
-        stats = emptyWriteStats();
-        writeStats.set(key, stats);
-    }
-    if (kind === "original") {
-        stats.originalWrites++;
-        stats.originalBytes += bytes;
-    } else {
-        stats.flushedWrites++;
-        stats.flushedBytes += bytes;
-    }
-}
-
-function getBucketWriteStats(key: string): BucketWriteStats {
-    return writeStats.get(key) || emptyWriteStats();
-}
-
-/** Zeroes the write statistics of every bucket in the account. */
-export function debugClearAccountWriteStats(account: string): number {
-    let prefix = `${account}/`;
-    let cleared = 0;
-    for (let key of [...writeStats.keys()]) {
-        if (!key.startsWith(prefix)) continue;
-        writeStats.delete(key);
-        cleared++;
+        console.log(`debugListAccountBuckets(${account}) took ${Date.now() - start}ms for ${names.length} buckets`);
     }
-    console.log(`Cleared the write statistics of ${cleared} buckets in account ${account}`);
-    return cleared;
 }

package/storage/remoteStorage/storeConfig.d.ts

@@ -23,6 +23,8 @@ export declare class StoreConfig {
 export type StorePolicy = {
     validWindow: [number, number];
     route?: [number, number];
+    public?: boolean;
+    immutable?: boolean;
     fast?: boolean;
     writeDelay?: number;
     noFullSync?: boolean;