Skip to content
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

Sigma 13 Denvet Release #3594

Merged
merged 7 commits into from
Dec 24, 2024
Merged

Sigma 13 Denvet Release #3594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
08e143e
Fix sqlite3 package
Dec 24, 2024
090d0aa
Fix sqlite3 package
Dec 24, 2024
b079214
Fix bash script
Dec 24, 2024
9694d9a
Fix publishing service batch scheduling
Mihajlo-Pavlovic Dec 24, 2024
71e6ffc
Version bump
Mihajlo-Pavlovic Dec 24, 2024
c80fb36
Merge pull request #3592 from OriginTrail/v8/data-migration-improvements
Mihajlo-Pavlovic Dec 24, 2024
7967d08
Merge pull request #3593 from OriginTrail/publish-scheduling-fix
brkagithub Dec 24, 2024
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 package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 5 additions & 1 deletion src/service/publish-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
4 changes: 3 additions & 1 deletion v8-data-migration/run-data-migration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
nohup node v8-data-migration.js &
cd /root/ot-node/current/v8-data-migration/ &&
npm rebuild sqlite3 &&
nohup node v8-data-migration.js > /root/ot-node/current/v8-data-migration/nohup.out 2>&1 &
Loading