Skip to content

GitLab

T
tangled
Commit 18eaa302 authored by Dmitry Khaleev's avatar Dmitry Khaleev
Browse files
Options

Merge remote-tracking branch 'origin/master' into issue/TG-7

parents 0744f8df d1e2fa5e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 161 deletions
millix_node/README.md
View file @ 18eaa302
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<br> <br>
<a href="#"><img src="https://github.com/millix/millix-wallet/blob/master/app/icon.png?raw=true" alt="millix node" width="200"></a> <a href="#"><img src="https://github.com/millix/millix-wallet/blob/master/app/icon.png?raw=true" alt="millix node" width="200"></a>
<br> <br>
millix node <small>v1.11.2</small> millix node <small>v1.11.3</small>
<br> <br>
</h1> </h1>
......
millix_node/core/config/config.js
View file @ 18eaa302
...@@ -774,8 +774,8 @@ export const NETWORK_SHORT_TIME_WAIT_MAX = 1500; ...@@ -774,8 +774,8 @@ export const NETWORK_SHORT_TIME_WAIT_MAX = 1500;
export const DATABASE_ENGINE = 'sqlite'; export const DATABASE_ENGINE = 'sqlite';
export const DATABASE_CONNECTION = {}; export const DATABASE_CONNECTION = {};
export const MILLIX_CIRCULATION = 9e15; export const MILLIX_CIRCULATION = 9e15;
export const NODE_MILLIX_BUILD_DATE = 1629213000; export const NODE_MILLIX_BUILD_DATE = 1629813663;
export const NODE_MILLIX_VERSION = '1.11.2-tangled'; export const NODE_MILLIX_VERSION = '1.11.4-tangled';
export const DATA_BASE_DIR_MAIN_NETWORK = './millix-tangled'; export const DATA_BASE_DIR_MAIN_NETWORK = './millix-tangled';
export const DATA_BASE_DIR_TEST_NETWORK = './millix-tangled'; export const DATA_BASE_DIR_TEST_NETWORK = './millix-tangled';
let DATA_BASE_DIR = MODE_TEST_NETWORK ? DATA_BASE_DIR_TEST_NETWORK : DATA_BASE_DIR_MAIN_NETWORK; let DATA_BASE_DIR = MODE_TEST_NETWORK ? DATA_BASE_DIR_TEST_NETWORK : DATA_BASE_DIR_MAIN_NETWORK;
...@@ -786,6 +786,7 @@ export const WALLET_KEY_PATH = DATA_BASE_DIR + ...@@ -786,6 +786,7 @@ export const WALLET_KEY_PATH = DATA_BASE_DIR +
export const JOB_CONFIG_PATH = DATA_BASE_DIR + '/job.json'; export const JOB_CONFIG_PATH = DATA_BASE_DIR + '/job.json';
export const JOB_CONFIG_VERSION = 4; export const JOB_CONFIG_VERSION = 4;
export const SHARD_ZERO_NAME = 'shard_zero'; export const SHARD_ZERO_NAME = 'shard_zero';
export const DEBUG_LOG_FILTER = [];
export const PEER_ROTATION_MORE_THAN_AVERAGE = 0.5; export const PEER_ROTATION_MORE_THAN_AVERAGE = 0.5;
export const PEER_ROTATION_MORE_THAN_MOST = 0.2; export const PEER_ROTATION_MORE_THAN_MOST = 0.2;
export const PEER_ROTATION_MORE_THAN_ALL = 0.01; export const PEER_ROTATION_MORE_THAN_ALL = 0.01;
...@@ -893,5 +894,6 @@ export default { ...@@ -893,5 +894,6 @@ export default {
PEER_ROTATION_MORE_THAN_ALL, PEER_ROTATION_MORE_THAN_ALL,
PEER_ROTATION_CONFIG, PEER_ROTATION_CONFIG,
JOB_CONFIG_PATH, JOB_CONFIG_PATH,
JOB_CONFIG_VERSION JOB_CONFIG_VERSION,
DEBUG_LOG_FILTER
}; };
millix_node/core/console.js
View file @ 18eaa302
...@@ -19,4 +19,6 @@ console.log = function() { ...@@ -19,4 +19,6 @@ console.log = function() {
enabled && showLog && config.MODE_DEBUG && _consoleLog.apply(console, arguments); enabled && showLog && config.MODE_DEBUG && _consoleLog.apply(console, arguments);
}; };
config.DEBUG_LOG_FILTER.forEach(filter => console.addFilter(filter));
export default console; export default console;
millix_node/core/task.js
View file @ 18eaa302
...@@ -29,7 +29,13 @@ class Task { ...@@ -29,7 +29,13 @@ class Task {
}); });
} }
else { else {
try {
task(); task();
}
catch (e) {
this.debug && console.log(`[task] error running task ${taskName}: ${e}`);
}
if (!once) { if (!once) {
self.runningTask[taskName] = setTimeout(run, waitTime); self.runningTask[taskName] = setTimeout(run, waitTime);
} }
......
millix_node/core/wallet/wallet-transaction-consensus.js
View file @ 18eaa302
...@@ -225,7 +225,7 @@ export class WalletTransactionConsensus { ...@@ -225,7 +225,7 @@ export class WalletTransactionConsensus {
message : `not validated in a depth of ${depth}` message : `not validated in a depth of ${depth}`
}); });
} }
else if (transaction.status === 2 || database.getRepository('transaction').isExpired(transaction.transaction_date)) { else if (transaction && (transaction.status === 2 || database.getRepository('transaction').isExpired(transaction.transaction_date))) {
return reject({ return reject({
cause : 'transaction_validation_max_depth', cause : 'transaction_validation_max_depth',
transaction_id_fail: transactionID, transaction_id_fail: transactionID,
...@@ -883,7 +883,9 @@ export class WalletTransactionConsensus { ...@@ -883,7 +883,9 @@ export class WalletTransactionConsensus {
} }
delete this._consensusRoundState[lockerID]; delete this._consensusRoundState[lockerID];
this._consensusRoundState[transactionID] = {}; this._consensusRoundState[transactionID] = {
timestamp: Date.now()
};
let unstableDateStart = ntp.now(); let unstableDateStart = ntp.now();
unstableDateStart.setMinutes(unstableDateStart.getMinutes() - config.TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN); unstableDateStart.setMinutes(unstableDateStart.getMinutes() - config.TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN);
...@@ -901,7 +903,8 @@ export class WalletTransactionConsensus { ...@@ -901,7 +903,8 @@ export class WalletTransactionConsensus {
return (() => { return (() => {
if (unstableDateStart.getTime() < pendingTransaction.transaction_date.getTime()) { // if not hibernated yet, we try to do a local validation first if (unstableDateStart.getTime() < pendingTransaction.transaction_date.getTime()) { // if not hibernated yet, we try to do a local validation first
return this._validateTransaction(transactionID, null, 0); return this._validateTransaction(transactionID, null, 0)
.catch(() => Promise.resolve());
} }
else { else {
return Promise.resolve(); return Promise.resolve();
......
millix_node/index.js
View file @ 18eaa302
...@@ -108,4 +108,4 @@ db.initialize() ...@@ -108,4 +108,4 @@ db.initialize()
}); });
} }
}); });
//millix v1.11.2-tangled //millix v1.11.4-tangled
millix_node/job/job-engine.js
View file @ 18eaa302
...@@ -19,6 +19,8 @@ import os from 'os'; ...@@ -19,6 +19,8 @@ import os from 'os';
class JobEngine { class JobEngine {
static JOB_WAIT_TIME = 1000;
constructor() { constructor() {
this.debug = false; this.debug = false;
this.configJobEngine = null; this.configJobEngine = null;
...@@ -93,21 +95,26 @@ class JobEngine { ...@@ -93,21 +95,26 @@ class JobEngine {
this.debug && console.log(`[job-engine] running job ${job.job_id} : ${job.job_name}`); this.debug && console.log(`[job-engine] running job ${job.job_id} : ${job.job_name}`);
let unlocked = false; let unlocked = false;
const timestampBegin = ntp.now(); const timestampBegin = ntp.now();
this.jobRepository.updateJobProgressStatus(job.job_id, 1, {last_date_begin: timestampBegin}) const payload = JSON.parse(job.job_payload);
const module = payload ? this.modules[payload.module] : undefined;
return this.jobRepository.updateJobProgressStatus(job.job_id, 1, {last_date_begin: timestampBegin})
.then(() => this.jobRepository.lockJobObject(job.job_id)) .then(() => this.jobRepository.lockJobObject(job.job_id))
.then(() => { .then(() => {
unlock(); unlock();
unlocked = true; unlocked = true;
// run job // run job
if (job.job_type_id === this.types['function']) { if (job.job_type_id === this.types['function']) {
const payload = JSON.parse(job.job_payload);
const module = this.modules[payload.module];
this.debug && console.log(`[job-engine] running function ${payload.module}:${payload.function_name}`); this.debug && console.log(`[job-engine] running function ${payload.module}:${payload.function_name}`);
if (!module || !payload || !module[payload.function_name]) {
return Promise.reject('job_invalid');
}
let postJob = () => { let postJob = () => {
const timestampEnd = ntp.now(); const timestampEnd = ntp.now();
const lastElapse = timestampEnd.getTime() - timestampBegin.getTime(); const lastElapse = timestampEnd.getTime() - timestampBegin.getTime();
this.debug && console.log(`[job-engine] done ${payload.module}:${payload.function_name} - ${lastElapse} ms`); this.debug && console.log(`[job-engine] done ${payload.module}:${payload.function_name} - ${lastElapse} ms`);
return new Promise((resolve, reject) => {
mutex.lock(['job-engine'], (unlockUpdate) => { mutex.lock(['job-engine'], (unlockUpdate) => {
this.jobRepository.updateJobProgressStatus(job.job_id, 0, { this.jobRepository.updateJobProgressStatus(job.job_id, 0, {
last_date_end: timestampEnd, last_date_end: timestampEnd,
...@@ -116,45 +123,29 @@ class JobEngine { ...@@ -116,45 +123,29 @@ class JobEngine {
}) })
.then(() => this.jobRepository.unlockJobObject(job.job_id)) .then(() => this.jobRepository.unlockJobObject(job.job_id))
.then(() => { .then(() => {
this.processorsStatus[processorTag]['running'] = false;
unlockUpdate(); unlockUpdate();
this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), 500, false, true); resolve();
}) })
.catch(() => { .catch(() => {
this.processorsStatus[processorTag]['running'] = false;
unlockUpdate(); unlockUpdate();
this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), 500, false, true); reject();
});
}); });
}); });
}; };
module[payload.function_name]() return module[payload.function_name]()
.then(postJob) .then(postJob)
.catch(postJob); .catch(postJob);
} }
else { else {
mutex.lock(['job-engine'], (unlockUpdate) => { return Promise.reject('job_not_supported');
this.jobRepository
.updateJobProgressStatus(job.job_id, 0, {
last_date_end: ntp.now(),
last_elapse : 0,
last_response: 'fail'
})
.then(() => this.jobRepository.unlockJobObject(job.job_id))
.then(() => {
this.processorsStatus[processorTag]['running'] = false;
unlockUpdate();
this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), 500, false, true);
})
.catch(() => {
this.processorsStatus[processorTag]['running'] = false;
unlockUpdate();
this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), 500, false, true);
});
});
} }
}) })
.catch(() => { .catch(() => {
const timestampEnd = ntp.now();
const lastElapse = timestampEnd.getTime() - timestampBegin.getTime();
this.debug && console.log(`[job-engine] done ${payload.module}:${payload.function_name} - ${lastElapse} ms`);
mutex.lock(['job-engine'], (unlockUpdate) => { mutex.lock(['job-engine'], (unlockUpdate) => {
let postJob = () => { let postJob = () => {
this.processorsStatus[processorTag]['running'] = false; this.processorsStatus[processorTag]['running'] = false;
...@@ -162,7 +153,7 @@ class JobEngine { ...@@ -162,7 +153,7 @@ class JobEngine {
if (!unlocked) { if (!unlocked) {
unlock(); unlock();
} }
this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), 500, false, true); this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), JobEngine.JOB_WAIT_TIME, false, true);
}; };
this.jobRepository this.jobRepository
...@@ -178,10 +169,17 @@ class JobEngine { ...@@ -178,10 +169,17 @@ class JobEngine {
}); });
} }
else { else {
return Promise.reject('job_not_found');
}
})
.then(() => {
this.processorsStatus[processorTag]['running'] = false; this.processorsStatus[processorTag]['running'] = false;
unlock();
this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), 500, false, true); this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), 500, false, true);
} })
.catch(() => {
this.processorsStatus[processorTag]['running'] = false;
unlock();
this.running && task.scheduleTask(processorTag, this._getTask.bind(this, processorTag, processorID), JobEngine.JOB_WAIT_TIME, false, true);
}); });
}); });
} }
......
millix_node/net/network.js
View file @ 18eaa302
...@@ -287,11 +287,11 @@ class Network { ...@@ -287,11 +287,11 @@ class Network {
database.getRepository('node') database.getRepository('node')
.listNodes() .listNodes()
.then((nodes) => { .then((nodes) => {
async.eachSeries(nodes, (node, callback) => { async.eachSeries(_.shuffle(nodes), (node, callback) => {
this.addNode(node.node_prefix, node.node_address, node.node_port, node.node_port_api, node.node_id); this.addNode(node.node_prefix, node.node_address, node.node_port, node.node_port_api, node.node_id);
callback(); callback();
}, () => { }, () => {
_.each(config.NODE_INITIAL_LIST, ({host, port_protocol: port, port_api: portApi}) => { _.each(_.shuffle(config.NODE_INITIAL_LIST), ({host, port_protocol: port, port_api: portApi}) => {
let prefix = config.WEBSOCKET_PROTOCOL; let prefix = config.WEBSOCKET_PROTOCOL;
let url = `${prefix}://${host}:${port}`; let url = `${prefix}://${host}:${port}`;
if ((!this._nodeList[url] || !this._nodeList[url].node_id) && (prefix && host && port && portApi)) { if ((!this._nodeList[url] || !this._nodeList[url].node_id) && (prefix && host && port && portApi)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment