diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-21 18:43:13 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-22 01:49:28 +0300 |
| commit | a564bceaa9e4f295dfd744bb509630d77590d590 (patch) | |
| tree | bfd2b60f7444e49569f04d9aec46e51b08fd2694 | |
| parent | d04bfe1bcc14397110cb62538f7b318d978c7699 (diff) | |
rz_kernel: refactoring out _init_DB()
| -rw-r--r-- | src/server/rz_kernel.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py index 346e3339..ba27ebd9 100644 --- a/src/server/rz_kernel.py +++ b/src/server/rz_kernel.py @@ -125,6 +125,14 @@ class RZ_Kernel(object): op_ret = self.db_ctl.exec_op(op) return op_ret.meta['ts_created'] + def _init_DB(self): + op_init = self.db_op_factory.gen_op__rzdb__init_DB() + self.db_ctl.exec_op(op_init) + op_probe = DBO_rzdb__fetch_DB_metablock() # reattempt mb fetch + db_mb = self.db_ctl.exec_op(op_probe) + log.info('DB initialized, schema-version: %s' % (db_mb['schema_version'])) + return db_mb + def start(self): def kernel_heartbeat(): @@ -155,11 +163,7 @@ class RZ_Kernel(object): db_mb = self.db_ctl.exec_op(op_probe) if db_mb is None: log.warning('uninitialized DB detected, attempting initialization') - op_init = self.op_factory__DBO_rzdb__init_DB.gen_op__rzdb__init_DB() - self.db_ctl.exec_op(op_init) - op_probe = DBO_rzdb__fetch_DB_metablock() # reattempt mb fetch - db_mb = self.db_ctl.exec_op(op_probe) - log.info('DB initialized, schema-version: %s' % (db_mb['schema_version'])) + db_mb = self._init_DB() else: log.info('DB metablock read, schema-version: %s' % (db_mb['schema_version'])) |