From 08e143e653b5f14ff207a987b6bfcc15caeee1ba Mon Sep 17 00:00:00 2001 From: Zvonimir Date: Tue, 24 Dec 2024 11:55:06 +0100 Subject: [PATCH 1/5] Fix sqlite3 package --- v8-data-migration/run-data-migration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v8-data-migration/run-data-migration.sh b/v8-data-migration/run-data-migration.sh index 3a84fb442..e774dabfb 100644 --- a/v8-data-migration/run-data-migration.sh +++ b/v8-data-migration/run-data-migration.sh @@ -1 +1 @@ -nohup node v8-data-migration.js & \ No newline at end of file +npm rebuild sqlite3 && nohup node v8-data-migration.js & \ No newline at end of file From 090d0aa69342e87bfc3a6ab233ac4f2f16fa5666 Mon Sep 17 00:00:00 2001 From: Zvonimir Date: Tue, 24 Dec 2024 12:30:49 +0100 Subject: [PATCH 2/5] Fix sqlite3 package --- v8-data-migration/run-data-migration.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/v8-data-migration/run-data-migration.sh b/v8-data-migration/run-data-migration.sh index e774dabfb..a24c9dab8 100644 --- a/v8-data-migration/run-data-migration.sh +++ b/v8-data-migration/run-data-migration.sh @@ -1 +1,3 @@ -npm rebuild sqlite3 && nohup node v8-data-migration.js & \ No newline at end of file +cd /root/ot-node/current/v8-data-migration/ && +npm rebuild sqlite3 && +nohup node v8-data-migration.js & \ No newline at end of file From b0792147111f049ce07ca1b0ad3919dc42bbbef1 Mon Sep 17 00:00:00 2001 From: Zvonimir Date: Tue, 24 Dec 2024 13:03:06 +0100 Subject: [PATCH 3/5] Fix bash script --- v8-data-migration/run-data-migration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v8-data-migration/run-data-migration.sh b/v8-data-migration/run-data-migration.sh index a24c9dab8..19947505e 100644 --- a/v8-data-migration/run-data-migration.sh +++ b/v8-data-migration/run-data-migration.sh @@ -1,3 +1,3 @@ cd /root/ot-node/current/v8-data-migration/ && npm rebuild sqlite3 && -nohup node v8-data-migration.js & \ No newline at end of file +nohup node v8-data-migration.js > /root/ot-node/current/v8-data-migration/nohup.out 2>&1 & \ No newline at end of file From 9694d9aa7d716041f466e6670fd32447542a735b Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 13:45:33 +0100 Subject: [PATCH 4/5] Fix publishing service batch scheduling --- src/service/publish-service.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/service/publish-service.js b/src/service/publish-service.js index cfcab86bd..3c8dfe1f6 100644 --- a/src/service/publish-service.js +++ b/src/service/publish-service.js @@ -97,7 +97,11 @@ class PublishService extends OperationService { // Not all requests sent, still possible to reach minimum replication, // schedule requests for leftover nodes const potentialCompletedNumber = completedNumber + leftoverNodes.length; - if (leftoverNodes.length > 0 && potentialCompletedNumber >= minAckResponses) { + if ( + leftoverNodes.length > 0 && + potentialCompletedNumber >= minAckResponses && + (totalResponses - 1) % batchSize === 0 + ) { await this.scheduleOperationForLeftoverNodes(command.data, leftoverNodes); } } From 71e6ffcaa64135153d5f873e75c035e4bc8a0699 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 13:47:54 +0100 Subject: [PATCH 5/5] Version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 366f111e8..6f6de7da0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "8.0.0-sigma.13", + "version": "8.0.0-sigma.14", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "8.0.0-sigma.13", + "version": "8.0.0-sigma.14", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3", diff --git a/package.json b/package.json index 423cf926e..ce65fce55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "8.0.0-sigma.13", + "version": "8.0.0-sigma.14", "description": "OTNode V8", "main": "index.js", "type": "module",