Merge pull request #83 from qminer/frozen

Frozen
qminer · Dec 13, 2017 · 85d5e29 · 85d5e29
2 parents 71c708f + eaaee30
commit 85d5e29
Show file tree

Hide file tree

Showing 18 changed files with 249 additions and 147 deletions.
diff --git a/built/db_updater.js.map b/built/db_updater.js.map
diff --git a/built/mysql_storage.d.ts b/built/mysql_storage.d.ts
@@ -5,6 +5,8 @@ export interface MySqlStorageParams {
     database: string;
     user: string;
     password: string;
+    retries: number;
+    retry_timeout: number;
 }
 export interface MySqlTopologyManager {
     insert(uuid: string, config: any, overwrite: boolean, callback: qtopology.SimpleCallback): any;
@@ -18,6 +20,7 @@ export declare class MySqlStorage implements qtopology.CoordinationStorage {
     init(callback: qtopology.SimpleCallback): void;
     close(callback: qtopology.SimpleCallback): void;
     private log(s);
+    static retry(times: number, timeout: number, isRetriableError: (e: Error) => boolean, step: (cb: qtopology.SimpleResultCallback<any>) => void, callback: qtopology.SimpleResultCallback<any>): void;
     private query(sql, obj, callback);
     getMessages(name: string, callback: qtopology.SimpleResultCallback<qtopology.StorageResultMessage[]>): void;
     getMessage(name: string, callback: qtopology.SimpleResultCallback<qtopology.StorageResultMessage>): void;
@@ -32,7 +35,7 @@ export declare class MySqlStorage implements qtopology.CoordinationStorage {
     announceLeaderCandidacy(name: string, callback: qtopology.SimpleCallback): void;
     checkLeaderCandidacy(name: string, callback: qtopology.SimpleResultCallback<boolean>): void;
     assignTopology(uuid: string, name: string, callback: qtopology.SimpleCallback): void;
-    setTopologyStatus(uuid: string, status: string, error: string, callback: qtopology.SimpleCallback): void;
+    setTopologyStatus(uuid: string, worker: string, status: string, error: string, callback: qtopology.SimpleCallback): void;
     setTopologyPid(uuid: string, pid: number, callback: qtopology.SimpleCallback): void;
     setWorkerStatus(name: string, status: string, callback: qtopology.SimpleCallback): void;
     setWorkerLStatus(name: string, lstatus: string, callback: qtopology.SimpleCallback): void;

diff --git a/built/mysql_storage.js b/built/mysql_storage.js
diff --git a/built/mysql_storage.js.map b/built/mysql_storage.js.map