-bug fix

-removed crash check

Author: aczwink

service/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "npx acts-util-apilib && npx webpack",
     "build-docker-image": "docker build -t odfs .",
-    "run-dev-server": "nodemon --exec \"npx acts-util-apilib; tsc; rm /srv/OpenDistributedFileStorage/crash_check; node dist/src/main.js\""
+    "run-dev-server": "nodemon --exec \"npx acts-util-apilib; tsc; node dist/src/main.js\""
   },
   "keywords": [],
   "author": "Amir Czwink",

service/src/data-access/StorageBlocksController.ts

@@ -1,6 +1,6 @@
 /**
  * OpenDistributedFileStorage
- * Copyright (C) 2024 Amir Czwink ([email protected])
+ * Copyright (C) 2024-2025 Amir Czwink ([email protected])
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -76,6 +76,20 @@ export class StorageBlocksController
         await conn.UpdateRows("storageblocks", { size: 0, iv: "", authTag: "" }, "id = ?", storageBlockId);
     }
 
+    public async IsBlockOnFreeList(storageBlockId: number)
+    {
+        const query = `
+        SELECT TRUE
+        FROM storageblocks_freed
+        WHERE storageBlockId = ?
+        `;
+        const conn = await this.dbConnMgr.CreateAnyConnectionQueryExecutor();
+        const row = await conn.SelectOne(query, storageBlockId);
+        if(row === undefined)
+            return false;
+        return true;
+    }
+
     public async PutOnResidualList(storageBlockId: number)
     {
         const conn = await this.dbConnMgr.CreateAnyConnectionQueryExecutor();

service/src/main.ts

@@ -1,6 +1,6 @@
 /**
  * OpenDistributedFileStorage
- * Copyright (C) 2024 Amir Czwink ([email protected])
+ * Copyright (C) 2024-2025 Amir Czwink ([email protected])
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * */
 import "dotenv/config";
-import fs from "fs";
 import http from "http";
 import { AbsURL, OpenAPI } from "acts-util-core";
 import { Factory, GlobalInjector, HTTP } from "acts-util-node";
 import { APIRegistry } from "acts-util-apilib";
 import { DBConnectionsManager } from "./data-access/DBConnectionsManager";
-import { CONFIG_AUDIENCE, CONFIG_OIDP_ENDPOINT, CONFIG_ORIGIN, CONFIG_PORT, CONFIG_ROOTDIR, CONFIG_UPLOADDIR } from "./env";
+import { CONFIG_AUDIENCE, CONFIG_OIDP_ENDPOINT, CONFIG_ORIGIN, CONFIG_PORT, CONFIG_UPLOADDIR } from "./env";
 import { StorageBackendsManager } from "./services/StorageBackendsManager";
 import { MessagingService } from "./services/MessagingService";
 import { JobOrchestrationService } from "./services/JobOrchestrationService";
@@ -34,8 +33,6 @@ import { StorageBlocksManager } from "./services/StorageBlocksManager";
 import { FileUploadProcessor } from "./services/FileUploadProcessor";
 import { GarbageColletor } from "./services/GarbageColletor";
 
-const crashDetectionPath = CONFIG_ROOTDIR + "/crash_check";
-
 async function DownloadPublicKey()
 {
     const sender = new HTTP.RequestSender();
@@ -137,26 +134,18 @@ async function BootstrapServer()
         console.log("Shutting server down...");
         GlobalInjector.Resolve(DBConnectionsManager).Close();
         GlobalInjector.Resolve(MessagingService).Close();
-        fs.unlinkSync(crashDetectionPath);
         server.close();
     });
 }
 
 function BootstrapService()
 {
-    if(fs.existsSync(crashDetectionPath))
-    {
-        console.log("Service did crash :S");
-        process.exit(1);
-        return;
-    }
     process.on("uncaughtException", (error, origin) => {
         console.log("Unhandled exception: ", error, origin);
     });
     process.on("unhandledRejection", (reason, promise) => {
         console.log("Unhandled rejection: ", reason, promise);
     });
-    fs.writeFileSync(crashDetectionPath, "");
 
     BootstrapServer();
 }

service/src/services/StorageBlocksManager.ts

@@ -1,6 +1,6 @@
 /**
  * OpenDistributedFileStorage
- * Copyright (C) 2024 Amir Czwink ([email protected])
+ * Copyright (C) 2024-2025 Amir Czwink ([email protected])
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -82,7 +82,17 @@ export class StorageBlocksManager
 
         const replicationBackends = this.storageBackendsManager.FindReplicationBackends(storageBackendIds).ToArray();
         if(replicationBackends.length > 0)
-        {            
+        {
+            if(storageBackendIds.length === 0)
+            {
+                if(await this.storageBlocksController.IsBlockOnFreeList(storageBlockId))
+                {
+                    //before it could be replicated it actually got merged. nothing left to be done here
+                    return;
+                }
+                throw new Error("This situation should never happen!!!");
+            }
+
             const encryptedBlock = await this.DownloadEncryptedStorageBlock(storageBlockId);
             for (const replicationBackend of replicationBackends)
             {