Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
d6b3896dd3 | |||
49b11b17ce | |||
4ac8a4c0cd | |||
7f9983382a | |||
54f529b0a7 | |||
f542463bf6 |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@push.rocks/smartdata",
|
"name": "@push.rocks/smartdata",
|
||||||
"version": "5.0.29",
|
"version": "5.0.32",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "do more with data",
|
"description": "do more with data",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
|
@ -55,6 +55,7 @@ tap.test('SmartdataDistributedCoordinator should handle distributed task request
|
|||||||
|
|
||||||
const mockTaskRequest: taskbuffer.distributedCoordination.IDistributedTaskRequest = {
|
const mockTaskRequest: taskbuffer.distributedCoordination.IDistributedTaskRequest = {
|
||||||
submitterId: "mockSubmitter12345", // Some unique mock submitter ID
|
submitterId: "mockSubmitter12345", // Some unique mock submitter ID
|
||||||
|
requestResponseId: 'uni879873462hjhfkjhsdf', // Some unique ID for the request-response
|
||||||
taskName: "SampleTask",
|
taskName: "SampleTask",
|
||||||
taskVersion: "1.0.0", // Assuming it's a version string
|
taskVersion: "1.0.0", // Assuming it's a version string
|
||||||
taskExecutionTime: Date.now(),
|
taskExecutionTime: Date.now(),
|
||||||
@ -105,7 +106,7 @@ tap.test('should elect only one leader amongst multiple instances', async (tools
|
|||||||
|
|
||||||
tap.test('should clean up', async () => {
|
tap.test('should clean up', async () => {
|
||||||
await smartmongoInstance.stopAndDumpToDir(`.nogit/testdata/`);
|
await smartmongoInstance.stopAndDumpToDir(`.nogit/testdata/`);
|
||||||
setTimeout(() => process.exit(0), 1000);
|
setTimeout(() => process.exit(), 2000);
|
||||||
})
|
})
|
||||||
|
|
||||||
tap.start({ throwOnError: true });
|
tap.start({ throwOnError: true });
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@push.rocks/smartdata',
|
name: '@push.rocks/smartdata',
|
||||||
version: '5.0.29',
|
version: '5.0.32',
|
||||||
description: 'do more with data'
|
description: 'do more with data'
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ import * as plugins from './smartdata.plugins.js';
|
|||||||
import { SmartdataDb } from './smartdata.classes.db.js';
|
import { SmartdataDb } from './smartdata.classes.db.js';
|
||||||
import { Manager, setDefaultManagerForDoc } from './smartdata.classes.collection.js';
|
import { Manager, setDefaultManagerForDoc } from './smartdata.classes.collection.js';
|
||||||
import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc.js';
|
import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc.js';
|
||||||
|
import { SmartdataDbWatcher } from './smartdata.classes.watcher.js';
|
||||||
|
|
||||||
@Manager()
|
@Manager()
|
||||||
export class DistributedClass extends SmartDataDbDoc<DistributedClass, DistributedClass> {
|
export class DistributedClass extends SmartDataDbDoc<DistributedClass, DistributedClass> {
|
||||||
@ -39,6 +40,7 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
|
|||||||
public db: SmartdataDb;
|
public db: SmartdataDb;
|
||||||
private asyncExecutionStack = new plugins.lik.AsyncExecutionStack();
|
private asyncExecutionStack = new plugins.lik.AsyncExecutionStack();
|
||||||
public ownInstance: DistributedClass;
|
public ownInstance: DistributedClass;
|
||||||
|
public distributedWatcher: SmartdataDbWatcher<DistributedClass>;
|
||||||
|
|
||||||
constructor(dbArg: SmartdataDb) {
|
constructor(dbArg: SmartdataDb) {
|
||||||
super();
|
super();
|
||||||
@ -54,6 +56,9 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
|
|||||||
|
|
||||||
public async stop() {
|
public async stop() {
|
||||||
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
if (this.distributedWatcher) {
|
||||||
|
await this.distributedWatcher.close();
|
||||||
|
}
|
||||||
if (this.ownInstance?.data.elected) {
|
if (this.ownInstance?.data.elected) {
|
||||||
this.ownInstance.data.elected = false;
|
this.ownInstance.data.elected = false;
|
||||||
}
|
}
|
||||||
@ -182,7 +187,7 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
|
|||||||
(instanceArg) =>
|
(instanceArg) =>
|
||||||
instanceArg.data.status === 'bidding' &&
|
instanceArg.data.status === 'bidding' &&
|
||||||
instanceArg.data.lastUpdated >=
|
instanceArg.data.lastUpdated >=
|
||||||
Date.now() - plugins.smarttime.getMilliSecondsFromUnits({ seconds: 6 })
|
Date.now() - plugins.smarttime.getMilliSecondsFromUnits({ seconds: 10 })
|
||||||
);
|
);
|
||||||
console.log(`found ${biddingInstances.length} bidding instances...`);
|
console.log(`found ${biddingInstances.length} bidding instances...`);
|
||||||
this.ownInstance.data.elected = true;
|
this.ownInstance.data.elected = true;
|
||||||
@ -208,12 +213,30 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
|
|||||||
* the leading is implemented here
|
* the leading is implemented here
|
||||||
*/
|
*/
|
||||||
public async leadFunction() {
|
public async leadFunction() {
|
||||||
const watcher = await DistributedClass.watch({});
|
this.distributedWatcher = await DistributedClass.watch({});
|
||||||
watcher.changeSubject.subscribe({
|
|
||||||
|
const currentTaskRequests: Array<{
|
||||||
|
taskName: string;
|
||||||
|
taskExecutionTime: number;
|
||||||
|
/**
|
||||||
|
* all instances that requested this task
|
||||||
|
*/
|
||||||
|
requestingDistibutedInstanceIds: string[];
|
||||||
|
responseTimeout: plugins.smartdelay.Timeout<any>;
|
||||||
|
}> = [];
|
||||||
|
|
||||||
|
this.distributedWatcher.changeSubject.subscribe({
|
||||||
next: async (distributedDoc) => {
|
next: async (distributedDoc) => {
|
||||||
|
if (!distributedDoc) {
|
||||||
|
console.log(`registered deletion of instance...`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
console.log(distributedDoc);
|
||||||
|
console.log(`registered change for ${distributedDoc.id}`);
|
||||||
distributedDoc;
|
distributedDoc;
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
while (this.ownInstance.data.status !== 'stopped' && this.ownInstance.data.elected) {
|
while (this.ownInstance.data.status !== 'stopped' && this.ownInstance.data.elected) {
|
||||||
const allInstances = await DistributedClass.getInstances({});
|
const allInstances = await DistributedClass.getInstances({});
|
||||||
for (const instance of allInstances) {
|
for (const instance of allInstances) {
|
||||||
@ -239,8 +262,18 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
|
|||||||
await this.ownInstance.save();
|
await this.ownInstance.save();
|
||||||
});
|
});
|
||||||
await plugins.smartdelay.delayFor(10000);
|
await plugins.smartdelay.delayFor(10000);
|
||||||
|
const result = await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
return null;
|
await this.ownInstance.updateFromDb();
|
||||||
|
const taskRequestResult = this.ownInstance.data.taskRequestResults.find((resultItem) => {
|
||||||
|
return resultItem.requestResponseId === taskRequestArg.requestResponseId;
|
||||||
|
});
|
||||||
|
return taskRequestResult;
|
||||||
|
});
|
||||||
|
if (!result) {
|
||||||
|
console.warn('no result found for task request...');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async updateDistributedTaskRequest(
|
public async updateDistributedTaskRequest(
|
||||||
|
@ -17,9 +17,13 @@ export class SmartdataDbWatcher<T = any> {
|
|||||||
smartdataDbDocArg: typeof SmartDataDbDoc
|
smartdataDbDocArg: typeof SmartDataDbDoc
|
||||||
) {
|
) {
|
||||||
this.changeStream = changeStreamArg;
|
this.changeStream = changeStreamArg;
|
||||||
this.changeStream.on('change', async (item: T) => {
|
this.changeStream.on('change', async (item: any) => {
|
||||||
|
if (!item.fullDocument) {
|
||||||
|
this.changeSubject.next(null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.changeSubject.next(
|
this.changeSubject.next(
|
||||||
smartdataDbDocArg.createInstanceFromMongoDbNativeDoc(item) as any as T
|
smartdataDbDocArg.createInstanceFromMongoDbNativeDoc(item.fullDocument) as any as T
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
plugins.smartdelay.delayFor(0).then(() => {
|
plugins.smartdelay.delayFor(0).then(() => {
|
||||||
|
Reference in New Issue
Block a user