ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Child Node Framework : cleanup node selection operation

montage-api
Moe 2021-11-26 20:53:06 -08:00
parent d20297429a
commit 3f20721dc9
2 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libs/childNode/utils.js
View File

@ -208,6 +208,48 @@ module.exports = function(s,config,lang,app,io){
})
})
}
function selectNodeForOperation(options){
const groupKey = options.ke
const monitorId = options.mid
var childNodeList = Object.keys(s.childNodes)
if(childNodeList.length > 0){
let childNodeFound = false
let childNodeSelected = null;
var nodeWithLowestActiveCamerasCount = 65535
var nodeWithLowestActiveCameras = null
childNodeList.forEach(function(webAddress){
const theChildNode = s.childNodes[webAddress]
delete(theChildNode.activeCameras[groupKey + monitorId])
var nodeCameraCount = Object.keys(theChildNode.activeCameras).length
if(
// child node is connected and available
!theChildNode.dead &&
// look for child node with least number of running cameras
nodeCameraCount < nodeWithLowestActiveCamerasCount &&
// look for child node with CPU usage below 75%
theChildNode.cpu < 75
){
nodeWithLowestActiveCamerasCount = nodeCameraCount
childNodeSelected = `${webAddress}`
}
})
if(childNodeSelected){
const theChildNode = s.childNodes[childNodeSelected]
const activeMonitor = s.group[groupKey].activeMonitors[monitorId];
const monitorConfig = Object.assign({},s.group[groupKey].rawMonitorConfigurations[monitorId])
theChildNode.activeCameras[groupKey + monitorId] = monitorConfig;
activeMonitor.childNode = childNodeSelected
activeMonitor.childNodeId = theChildNode.cnid;
s.cx({
f: 'sync',
sync: monitorConfig,
ke: groupKey,
mid: monitorId
},activeMonitor.childNodeId);
return theChildNode;
}
}
}
return {
getIpAddress,
initiateDataConnection,
@ -215,5 +257,6 @@ module.exports = function(s,config,lang,app,io){
onDataConnectionDisconnect,
initiateVideoWriteFromChildNode,
initiateTimelapseFrameWriteFromChildNode,
selectNodeForOperation,
}
}

43
libs/monitor.js
View File

@ -40,6 +40,9 @@ module.exports = function(s,config,lang){
const {
scanForOrphanedVideos
} = require('./video/utils.js')(s,config,lang)
const {
selectNodeForOperation
} = require('./childNode/utils.js')(s,config,lang)
const startMonitorInQueue = createQueue(1, 3)
s.initiateMonitorObject = function(e){
if(!s.group[e.ke]){s.group[e.ke]={}};
@ -1310,34 +1313,12 @@ module.exports = function(s,config,lang){
}
try{
if(config.childNodes.enabled === true && config.childNodes.mode === 'master'){
var copiedMonitorObject = s.cleanMonitorObject(s.group[e.ke].rawMonitorConfigurations[e.id])
var childNodeList = Object.keys(s.childNodes)
if(childNodeList.length > 0){
e.childNodeFound = false
var selectNode = function(ip){
e.childNodeFound = true
e.childNodeSelected = ip
}
var nodeWithLowestActiveCamerasCount = 65535
var nodeWithLowestActiveCameras = null
childNodeList.forEach(function(ip){
delete(s.childNodes[ip].activeCameras[e.ke+e.id])
var nodeCameraCount = Object.keys(s.childNodes[ip].activeCameras).length
if(!s.childNodes[ip].dead && nodeCameraCount < nodeWithLowestActiveCamerasCount && s.childNodes[ip].cpu < 75){
nodeWithLowestActiveCamerasCount = nodeCameraCount
nodeWithLowestActiveCameras = ip
}
})
if(nodeWithLowestActiveCameras)selectNode(nodeWithLowestActiveCameras)
if(e.childNodeFound === true){
s.childNodes[e.childNodeSelected].activeCameras[e.ke+e.id] = copiedMonitorObject
activeMonitor.childNode = e.childNodeSelected
activeMonitor.childNodeId = s.childNodes[e.childNodeSelected].cnid;
s.cx({f:'sync',sync:s.group[e.ke].rawMonitorConfigurations[e.id],ke:e.ke,mid:e.id},activeMonitor.childNodeId);
doOnChildMachine()
}else{
startMonitorInQueue.push(doOnThisMachine,function(){})
}
const selectedNode = selectNodeForOperation({
ke: e.ke,
mid: e.id,
});
if(selectedNode){
doOnChildMachine()
}else{
startMonitorInQueue.push(doOnThisMachine,function(){})
}
@ -1600,8 +1581,10 @@ module.exports = function(s,config,lang){
code: wantedStatusCode,
})
if(
config.childNodes.enabled === true &&
config.childNodes.mode === 'master' ||
(
config.childNodes.enabled === true &&
config.childNodes.mode === 'master'
) ||
config.childNodes.enabled === false
){
setTimeout(() => {