Added load-based api node selection
This commit is contained in:
parent
9ada79d1e5
commit
7a254a5139
4 changed files with 87 additions and 7 deletions
|
@ -45,6 +45,6 @@ COPY . .
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
USER esmBot
|
USER esmBot
|
||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 8080
|
||||||
|
|
||||||
ENTRYPOINT ["node", "api/index.js"]
|
ENTRYPOINT ["node", "api/index.js"]
|
31
api/index.js
31
api/index.js
|
@ -9,7 +9,7 @@ const net = require("net");
|
||||||
const dgram = require("dgram"); // for UDP servers
|
const dgram = require("dgram"); // for UDP servers
|
||||||
const socket = dgram.createSocket("udp4"); // Our universal UDP socket, this might cause issues and we may have to use a seperate socket for each connection
|
const socket = dgram.createSocket("udp4"); // Our universal UDP socket, this might cause issues and we may have to use a seperate socket for each connection
|
||||||
|
|
||||||
var start = process.hrtime();
|
const start = process.hrtime();
|
||||||
const log = (msg, thread) => {
|
const log = (msg, thread) => {
|
||||||
console.log(`[${process.hrtime(start)[1] / 1000000}${(thread)?`:${thread}`:""}]\t ${msg}`);
|
console.log(`[${process.hrtime(start)[1] / 1000000}${(thread)?`:${thread}`:""}]\t ${msg}`);
|
||||||
};
|
};
|
||||||
|
@ -21,6 +21,32 @@ const queue = [];
|
||||||
|
|
||||||
if (isMainThread) {
|
if (isMainThread) {
|
||||||
const { v4: uuidv4 } = require("uuid");
|
const { v4: uuidv4 } = require("uuid");
|
||||||
|
let cpuLoad;
|
||||||
|
|
||||||
|
const getAverage = () => {
|
||||||
|
const cpus = os.cpus();
|
||||||
|
let idle = 0;
|
||||||
|
let tick = 0;
|
||||||
|
for (const cpu of cpus) {
|
||||||
|
for (const type in cpu.times) {
|
||||||
|
tick += cpu.times[type];
|
||||||
|
}
|
||||||
|
idle += cpu.times.idle;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
idle: idle / cpus.length,
|
||||||
|
tick: tick / cpus.length
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
let measure = getAverage();
|
||||||
|
setInterval(() => {
|
||||||
|
const newMeasure = getAverage();
|
||||||
|
const idleDiff = newMeasure.idle - measure.idle;
|
||||||
|
const tickDiff = newMeasure.tick - measure.tick;
|
||||||
|
cpuLoad = 100 - ~~(100 * idleDiff / tickDiff);
|
||||||
|
measure = newMeasure;
|
||||||
|
}, 5000);
|
||||||
|
|
||||||
const MAX_WORKERS = process.env.WORKERS === "" ? parseInt(process.env.WORKERS) : os.cpus().length * 4; // Completely arbitrary, should usually be some multiple of your amount of cores
|
const MAX_WORKERS = process.env.WORKERS === "" ? parseInt(process.env.WORKERS) : os.cpus().length * 4; // Completely arbitrary, should usually be some multiple of your amount of cores
|
||||||
let workingWorkers = 0;
|
let workingWorkers = 0;
|
||||||
|
@ -73,6 +99,7 @@ if (isMainThread) {
|
||||||
const req = msg.toString().slice(1,msg.length);
|
const req = msg.toString().slice(1,msg.length);
|
||||||
// 0x0 == Cancel job
|
// 0x0 == Cancel job
|
||||||
// 0x1 == Queue job
|
// 0x1 == Queue job
|
||||||
|
// 0x2 == Get CPU usage
|
||||||
if (opcode == 0x0) {
|
if (opcode == 0x0) {
|
||||||
queue.shift();
|
queue.shift();
|
||||||
delete jobs[req];
|
delete jobs[req];
|
||||||
|
@ -88,6 +115,8 @@ if (isMainThread) {
|
||||||
|
|
||||||
const newBuffer = Buffer.concat([Buffer.from([0x0]), Buffer.from(uuid)]);
|
const newBuffer = Buffer.concat([Buffer.from([0x0]), Buffer.from(uuid)]);
|
||||||
socket.send(newBuffer, rinfo.port, rinfo.address);
|
socket.send(newBuffer, rinfo.port, rinfo.address);
|
||||||
|
} else if (opcode == 0x2) {
|
||||||
|
socket.send(Buffer.concat([Buffer.from([0x3]), Buffer.from(cpuLoad.toString())]), rinfo.port, rinfo.address);
|
||||||
} else {
|
} else {
|
||||||
log("Could not parse message");
|
log("Could not parse message");
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "node-gyp configure build",
|
"build": "node-gyp configure build",
|
||||||
"docker:build-api": "docker build -t esmbot-api --no-cache -f Dockerfile.api .",
|
"docker:build-api": "docker build -t esmbot-api -f Dockerfile.api .",
|
||||||
"docker:build-ss": "docker build -t headless-chrome-alpine --no-cache ./utils/screenshot",
|
"docker:build-ss": "docker build -t headless-chrome-alpine --no-cache ./utils/screenshot",
|
||||||
"docker:run-api": "docker run --rm --network=host esmbot-api",
|
"docker:run-api": "docker run --rm --network=host esmbot-api",
|
||||||
"docker:run-ss": "docker run --rm --network=host --shm-size=128m headless-chrome-alpine",
|
"docker:run-ss": "docker run --rm --network=host --shm-size=128m headless-chrome-alpine",
|
||||||
|
|
|
@ -11,6 +11,57 @@ const servers = require("../servers.json").image;
|
||||||
|
|
||||||
const formats = ["image/jpeg", "image/png", "image/webp", "image/gif"];
|
const formats = ["image/jpeg", "image/png", "image/webp", "image/gif"];
|
||||||
|
|
||||||
|
const chooseServer = async (ideal) => {
|
||||||
|
if (ideal.length === 0) throw "No available servers";
|
||||||
|
const sorted = ideal.sort((a, b) => {
|
||||||
|
return a.load - b.load;
|
||||||
|
});
|
||||||
|
return sorted[0];
|
||||||
|
};
|
||||||
|
|
||||||
|
const getIdeal = () => {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const socket = dgram.createSocket("udp4");
|
||||||
|
let serversLeft = servers.length;
|
||||||
|
const idealServers = [];
|
||||||
|
const timeout = setTimeout(() => {
|
||||||
|
socket.close(async () => {
|
||||||
|
try {
|
||||||
|
const server = await chooseServer(idealServers);
|
||||||
|
resolve(server);
|
||||||
|
} catch (e) {
|
||||||
|
reject(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}, 5000);
|
||||||
|
socket.on("message", async (msg, rinfo) => {
|
||||||
|
const opcode = msg.readUint8(0);
|
||||||
|
const res = parseInt(msg.slice(1, msg.length).toString());
|
||||||
|
if (opcode === 0x3) {
|
||||||
|
serversLeft--;
|
||||||
|
idealServers.push({
|
||||||
|
addr: rinfo.address,
|
||||||
|
load: res
|
||||||
|
});
|
||||||
|
if (!serversLeft) {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
try {
|
||||||
|
const server = await chooseServer(idealServers);
|
||||||
|
resolve(server);
|
||||||
|
} catch (e) {
|
||||||
|
reject(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
for (const server of servers) {
|
||||||
|
socket.send(Buffer.from([0x2]), 8080, server, (err) => {
|
||||||
|
if (err) reject(err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
const getFormat = (buffer, delimiter) => {
|
const getFormat = (buffer, delimiter) => {
|
||||||
for (var i = 0; i < buffer.length ; i++) {
|
for (var i = 0; i < buffer.length ; i++) {
|
||||||
if (String.fromCharCode(buffer[i]) === delimiter) {
|
if (String.fromCharCode(buffer[i]) === delimiter) {
|
||||||
|
@ -61,7 +112,7 @@ exports.getType = async (image) => {
|
||||||
exports.run = (object, fromAPI = false) => {
|
exports.run = (object, fromAPI = false) => {
|
||||||
return new Promise(async (resolve, reject) => {
|
return new Promise(async (resolve, reject) => {
|
||||||
if (process.env.API === "true" && !fromAPI) {
|
if (process.env.API === "true" && !fromAPI) {
|
||||||
const currentServer = servers[Math.floor(Math.random() * servers.length)];
|
const currentServer = await getIdeal();
|
||||||
const socket = dgram.createSocket("udp4");
|
const socket = dgram.createSocket("udp4");
|
||||||
const data = Buffer.concat([Buffer.from([0x1]), Buffer.from(JSON.stringify(object))]);
|
const data = Buffer.concat([Buffer.from([0x1]), Buffer.from(JSON.stringify(object))]);
|
||||||
|
|
||||||
|
@ -79,7 +130,7 @@ exports.run = (object, fromAPI = false) => {
|
||||||
jobID = uuid;
|
jobID = uuid;
|
||||||
} else if (opcode === 0x1) {
|
} else if (opcode === 0x1) {
|
||||||
if (jobID === uuid) {
|
if (jobID === uuid) {
|
||||||
const client = net.createConnection(req.toString(), currentServer);
|
const client = net.createConnection(req.toString(), currentServer.addr);
|
||||||
const array = [];
|
const array = [];
|
||||||
client.on("data", (rawData) => {
|
client.on("data", (rawData) => {
|
||||||
array.push(rawData);
|
array.push(rawData);
|
||||||
|
@ -95,7 +146,7 @@ exports.run = (object, fromAPI = false) => {
|
||||||
resolve(payload);
|
resolve(payload);
|
||||||
});
|
});
|
||||||
client.on("error", (err) => {
|
client.on("error", (err) => {
|
||||||
throw err;
|
reject(err);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if (opcode === 0x2) {
|
} else if (opcode === 0x2) {
|
||||||
|
@ -103,7 +154,7 @@ exports.run = (object, fromAPI = false) => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.send(data, 8080, currentServer, (err) => {
|
socket.send(data, 8080, currentServer.addr, (err) => {
|
||||||
if (err) reject(err);
|
if (err) reject(err);
|
||||||
});
|
});
|
||||||
} else if (isMainThread && !fromAPI) {
|
} else if (isMainThread && !fromAPI) {
|
||||||
|
|
Loading…
Reference in a new issue