hammerkit 2.0.0-next.1 → 2.0.0-next.3

package/dist/kubernetes/kept-claims.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evictKeptClaims = exports.sweepKeptClaims = exports.expireKeptClaims = exports.recordClaimState = exports.forgetClaimState = exports.useClaimState = exports.isKeptClaim = exports.getClaimName = exports.EXPIRES_ANNOTATION = exports.STATE_ANNOTATION = exports.KEPT_BY_LABEL = exports.VOLUME_SCOPE_LABEL = void 0;
+exports.evictKeptClaims = exports.sweepKeptClaims = exports.expireKeptClaims = exports.recordClaimState = exports.forgetClaimState = exports.rememberedClaimState = exports.useClaimState = exports.isKeptClaim = exports.getClaimName = exports.EXPIRES_ANNOTATION = exports.STATE_ANNOTATION = exports.KEPT_BY_LABEL = exports.VOLUME_SCOPE_LABEL = void 0;
 const crypto_1 = require("crypto");
 const apply_1 = require("./apply");
 const sleep_1 = require("../utils/sleep");
@@ -98,6 +98,17 @@ async function annotate(instance, namespace, name, annotations) {
         throw e;
     }
 }
+// The state key of the outputs whose folder is whole in the claim of a task of a service run
+// (see getStateFilesDir), null when it names none. The run's namespace is its own, and only
+// the run writes to the claim: it forgets the state before it writes, records it after.
+async function rememberedClaimState(instance, kubernetes, name) {
+    const claim = await readClaim(instance, kubernetes.namespace, name);
+    if (!claim || claim.metadata?.deletionTimestamp) {
+        return null;
+    }
+    return claim.metadata?.annotations?.[exports.STATE_ANNOTATION] ?? null;
+}
+exports.rememberedClaimState = rememberedClaimState;
 // Before a task writes to its kept claim: the outputs in it stop being those of a state.
 // Whether the claim was there, with what an earlier run left in it.
 function forgetClaimState(instance, kubernetes, name) {

package/dist/planner/work-runtime-kubernetes.js

@@ -170,6 +170,9 @@ function kubernetesTaskRuntime(task, kubernetes) {
     // on a server that keeps them, the task's claim stays after the run with the state of its
     // outputs, and the next run of the same source mounts them as they are (see kept-claims)
     const kept = (0, kept_claims_1.isKeptClaim)(task, kubernetes);
+    // on a service run, the claim names the last state whose folder is whole (see
+    // rememberedClaimState): a wake or a move at that state mounts it without an upload
+    const remembers = kept || !!kubernetes.server?.serviceRun;
     const claim = (0, volumes_1.getVolumeName)(task, kubernetes);
     return {
         initialize() {
@@ -182,6 +185,16 @@ function kubernetesTaskRuntime(task, kubernetes) {
                 stateKey &&
                 (await (0, ensure_persistent_data_1.getStateDirsInUse)(instance, kubernetes.namespace, claim)).has((0, volumes_1.getStateFilesDir)(stateKey))) {
                 task.status.write('info', `${task.name}: services of the run use its outputs of this state, they stay`);
+                await (0, kept_claims_1.recordClaimState)(instance, kubernetes, claim, stateKey);
+                return;
+            }
+            if (remembers && !kept) {
+                // the folder of the state is written now: until it is whole, the claim names no state
+                await (0, kept_claims_1.forgetClaimState)(instance, kubernetes, claim);
+                await (0, restore_kubernetes_data_1.restoreKubernetesData)(task, kubernetes, instance, environment, path, { stateKey });
+                if (stateKey) {
+                    await (0, kept_claims_1.recordClaimState)(instance, kubernetes, claim, stateKey);
+                }
                 return;
             }
             if (!kept) {
@@ -231,11 +244,14 @@ function kubernetesTaskRuntime(task, kubernetes) {
             try {
                 if (files && (await (0, ensure_persistent_data_1.getStateDirsInUse)(instance, kubernetes.namespace, claim)).has(files.dir)) {
                     task.status.write('info', `${task.name}: services of the run use its outputs of this state, they stay`);
+                    await (0, kept_claims_1.recordClaimState)(instance, kubernetes, claim, options.stateKey);
                     return;
                 }
                 // the task writes to it now: what it holds stops being the outputs of a state, and
-                // goes, as a new claim would hold nothing
-                const reset = kept && (await (0, kept_claims_1.forgetClaimState)(instance, kubernetes, claim));
+                // goes, as a new claim would hold nothing (on a service run, the folders of other
+                // states that no pod mounts go)
+                const forgotten = remembers && (await (0, kept_claims_1.forgetClaimState)(instance, kubernetes, claim));
+                const reset = kept && forgotten;
                 await (0, ensure_persistent_data_1.ensurePersistentData)(instance, kubernetes, environment, task, persistence, { reset, files });
             }
             catch (e) {
@@ -415,7 +431,7 @@ function kubernetesTaskRuntime(task, kubernetes) {
                 }
                 // the finished job stays for its state, the values it read need not
                 await removeTaskSecrets(instance, kubernetes, task);
-                if (kept) {
+                if (remembers) {
                     await (0, kept_claims_1.recordClaimState)(instance, kubernetes, claim, options.stateKey);
                 }
             }
@@ -471,6 +487,13 @@ function kubernetesTaskRuntime(task, kubernetes) {
                 // the server removes the Jobs of a run at its end, the claim says
                 return (0, kept_claims_1.useClaimState)(instance, kubernetes, claim);
             }
+            if (remembers) {
+                // a service run that sleeps loses its Jobs but keeps its claims, the claim says
+                const remembered = await (0, kept_claims_1.rememberedClaimState)(instance, kubernetes, claim);
+                if (remembered) {
+                    return remembered;
+                }
+            }
             const jobs = await instance.batchApi.listNamespacedJob({
                 namespace: kubernetes.namespace,
                 labelSelector: (0, resources_1.getItemSelector)(task, kubernetes),

package/dist/remote/host-config.js

@@ -31,7 +31,7 @@ exports.hostServerSchema = zod_1.z
     .strict();
 // A command that prints the token for a server instead of a login, see token-source.ts.
 // It is bound to the url and issuer it was registered for, like a sign-in, and lives
-// beside `servers` rather than in it: hammerkit before 1.27 refuses unknown keys of a
+// beside `servers` rather than in it: hammerkit before 2.0 refuses unknown keys of a
 // server, but keeps unknown top-level keys. It is only ever read from the host config,
 // a build file can't name one.
 const tokenCommandSchema = zod_1.z

package/dist/remote/remote-work-commands.js

@@ -221,7 +221,7 @@ function registerWorkCommands(remote, context) {
         }
         return { version, proposed };
     };
-    // what publishing the bundle would do, undefined from a server that can't say (before 1.27)
+    // what publishing the bundle would do, undefined from a server that can't say (before 2.0)
     const planBundle = async (server, token, bundle) => {
         try {
             return (await (0, server_client_1.callServer)(server, token, 'POST', '/v1/definitions/plan', bundle)).body;
@@ -271,7 +271,7 @@ function registerWorkCommands(remote, context) {
             if (!environment.prompt) {
                 throw new Error(`${notPublished}, publish it first with: hammerkit remote publish ${serverName}, or pass --publish`);
             }
-            // a server before 1.27 can't say what publishing would do: it is asked all the same,
+            // a server before 2.0 can't say what publishing would do: it is asked all the same,
             // and refuses then what the caller may not do
             const planned = await planBundle(server, token, local);
             if (planned && planned.outcome === null) {
@@ -322,7 +322,7 @@ function registerWorkCommands(remote, context) {
             const { name: serverName, server, token } = await connect(name);
             const answer = await (0, server_client_1.callServer)(server, token, 'POST', '/v1/definitions/plan', bundle).catch((e) => {
                 throw e instanceof server_client_1.ServerError && e.status === 404
-                    ? new Error(`${serverName} can't check a build file without publishing it, it needs hammerkit 1.27`)
+                    ? new Error(`${serverName} can't check a build file without publishing it, it needs hammerkit 2.0`)
                     : e;
             });
             const planned = answer.body;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hammerkit",
   "description": "Containerized build tool with incremental caching that runs the same build file locally, in Docker and on Kubernetes.",
-  "version": "2.0.0-next.1",
+  "version": "2.0.0-next.3",
   "keywords": [
     "build",
     "build-tool",