Skip to content

Commit

Permalink
存在更新失败的情况时程序状态码不为0
Browse files Browse the repository at this point in the history
  • Loading branch information
Lin-Dongzhao committed Aug 22, 2024
1 parent e5a9355 commit adaa3e7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion rqalpha/cmds/bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def update_bundle(data_bundle_path, rqdatac_uri, compression, concurrency):
return 1

from rqalpha.data.bundle import update_bundle as update_bundle_
update_bundle_(os.path.join(data_bundle_path, 'bundle'), False, compression, concurrency)
return update_bundle_(os.path.join(data_bundle_path, 'bundle'), False, compression, concurrency)


@cli.command(help=_("Download bundle (monthly updated)"))
Expand Down
22 changes: 15 additions & 7 deletions rqalpha/data/bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
from rqalpha.utils.logger import init_logger, system_log
from rqalpha.environment import Environment
from rqalpha.model.instrument import Instrument
import multiprocessing
from multiprocessing.sharedctypes import Synchronized

START_DATE = 20050104
END_DATE = 29991231
Expand Down Expand Up @@ -354,11 +356,13 @@ def __call__(self, path, fields, **kwargs):
if need_recreate_h5:
yield from GenerateDayBarTask(self._order_book_ids)(path, fields, **kwargs)
else:
h5 = None
try:
h5 = h5py.File(path, 'a')
except OSError:
system_log.error("File {} update failed, if it is using, please update later, "
"or you can delete then update again".format(path))
sval.value = 1
yield 1
else:
is_futures = "futures" == os.path.basename(path).split(".")[0]
Expand All @@ -371,6 +375,7 @@ def __call__(self, path, fields, **kwargs):
except OSError:
system_log.error("File {} update failed, if it is using, please update later, "
"or you can delete then update again".format(path))
sval.value = 1
yield 1
break
except ValueError:
Expand Down Expand Up @@ -400,19 +405,20 @@ def __call__(self, path, fields, **kwargs):
h5.create_dataset(order_book_id, data=df.to_records(), **kwargs)
yield 1
finally:
h5.close()
if h5:
h5.close()


def init_rqdatac_with_warnings_catch():
def process_init(args: Optional[Synchronized] = None):
import warnings
with warnings.catch_warnings(record=True):
# catch warning: rqdatac is already inited. Settings will be changed
rqdatac.init()


def process_init_func():
init_rqdatac_with_warnings_catch()
init_logger()
# Initialize process shared variables
if args:
global sval
sval = args


def update_bundle(path, create, enable_compression=False, concurrency=1):
Expand Down Expand Up @@ -440,14 +446,16 @@ def update_bundle(path, create, enable_compression=False, concurrency=1):
gen_suspended_days, gen_yield_curve, gen_share_transformation, gen_future_info
)

status_code = multiprocessing.Value("i", 0)
with ProgressedProcessPoolExecutor(
max_workers=concurrency, initializer=process_init_func
max_workers=concurrency, initializer=process_init, initargs=(status_code, )
) as executor:
# windows上子进程需要执行rqdatac.init, 其他os则需要执行rqdatac.reset; rqdatac.init包含了rqdatac.reset的功能
for func in gen_file_funcs:
executor.submit(GenerateFileTask(func), path)
for file, order_book_id, field in day_bar_args:
executor.submit(_DayBarTask(order_book_id), os.path.join(path, file), field, **kwargs)
return status_code.value


class AutomaticUpdateBundle(object):
Expand Down

0 comments on commit adaa3e7

Please sign in to comment.