Minz/toho-jose
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Implement round-robin for node selection

Browse Source
This commit is contained in:
Jan Groß
2023-06-07 17:08:22 +02:00
parent 77b8c4356d
commit ecfffa68a3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/index.js
View File

@@ -21,6 +21,7 @@ let jobs = {
finished: {} finished: {}
} }
let nodeIndex = 0;
let nodes = {}; let nodes = {};
app.use(express.json()); app.use(express.json());
@@ -57,7 +58,9 @@ app.post("/jobs", async (req, res) => {
jobs['queued'][jobId] = req.body; jobs['queued'][jobId] = req.body;
jobs['queued'][jobId]['jobId'] = jobId; jobs['queued'][jobId]['jobId'] = jobId;
console.log(`Queued Job ${jobId}`); console.log(`Queued Job ${jobId}`);
var client = Array.from(wss.clients)[0]; let nodes = Array.from(wss.clients);
nodeIndex = (nodeIndex + 1) % nodes.length;
var client = nodes[nodeIndex];
if(!client) { if(!client) {
res.status(503).json({ 'message': 'No render nodes available', 'jobId': jobId }); res.status(503).json({ 'message': 'No render nodes available', 'jobId': jobId });
return; return;
@@ -66,7 +69,7 @@ app.post("/jobs", async (req, res) => {
let response = new Promise(function (resolve, reject){ let response = new Promise(function (resolve, reject){
jobs['queued'][jobId]['promise'] = {resolve: resolve, reject: reject}; jobs['queued'][jobId]['promise'] = {resolve: resolve, reject: reject};
}); });
console.log("Sent job to node", client.nodeID); console.log(`Sent job to node ${nodeIndex+1}/${nodes.length} `, client.nodeID);
let result = await response.then(ResolveJob) let result = await response.then(ResolveJob)
res.json({ 'jobId': jobId, "path": result["path"] }); res.json({ 'jobId': jobId, "path": result["path"] });
}); });
@@ -80,8 +83,7 @@ wss.on('connection', function connection(ws) {
ws.on('message', function message(data) { ws.on('message', function message(data) {
let request = JSON.parse(data); let request = JSON.parse(data);
console.log('received: %s', data);
if(request["register"]){ if(request["register"]){
if(request["register"]["auth_key"] !== process.env.NODE_AUTH_KEY) { if(request["register"]["auth_key"] !== process.env.NODE_AUTH_KEY) {
console.log("INVALID AUTH KEY. Disconnecting ", nodeID); console.log("INVALID AUTH KEY. Disconnecting ", nodeID);
@@ -91,7 +93,7 @@ wss.on('connection', function connection(ws) {
ws.send(JSON.stringify({"welcome": { "clientId": nodeID }})); ws.send(JSON.stringify({"welcome": { "clientId": nodeID }}));
console.log("Node registered", nodeID); console.log("Node registered", nodeID);
} }
if(request["result"]) { if(request["result"]) {
let jobResult = request["result"] let jobResult = request["result"]
jobs['queued'][jobResult["jobId"]]['promise'].resolve(jobResult); jobs['queued'][jobResult["jobId"]]['promise'].resolve(jobResult);