diff options
| author | artgromov <artgromov@ydb.tech> | 2023-12-05 00:45:51 +0300 |
|---|---|---|
| committer | artgromov <artgromov@ydb.tech> | 2023-12-05 08:30:29 +0300 |
| commit | e92c23fea0e3ebe3613fd2e0708e09abd35aa5fb (patch) | |
| tree | ee56b0860f13e1aeab18e3dbf4177c24b9ddb4d1 | |
| parent | e3af9d79b9c29714dda6df3a21f2be4e006eb4e4 (diff) | |
| download | ydb-e92c23fea0e3ebe3613fd2e0708e09abd35aa5fb.tar.gz | |
add LD_LIBRARY_PATH
| -rw-r--r-- | ydb/tools/ydbd_slice/__init__.py | 7 | ||||
| -rw-r--r-- | ydb/tools/ydbd_slice/handlers.py | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ydb/tools/ydbd_slice/__init__.py b/ydb/tools/ydbd_slice/__init__.py index be1bc7b508..4e862f1555 100644 --- a/ydb/tools/ydbd_slice/__init__.py +++ b/ydb/tools/ydbd_slice/__init__.py @@ -388,6 +388,9 @@ def deduce_kikimr_bin_from_args(args): else: sys.exit("unable to deduce kikimr bin") + if 'LD_LIBRARY_PATH' not in os.environ: + os.environ['LD_LIBRARY_PATH'] = os.path.dirname(path) + compressed_path = args.kikimr_lz4 logger.info("use kikimr bin '%s'", path) @@ -466,7 +469,7 @@ def binaries_args(): args.add_argument( "--build_args", metavar="BUILD_ARGS", - default=['--checkout', '-r'], + default=['-r'], nargs=argparse.REMAINDER, help="remaining arguments are treated as arguments to 'ya make' tool (only valid if --arcadia is provided)" ) @@ -736,7 +739,7 @@ def add_arguments_docker_build_with_remainder(mode, add_force_rebuild=False): group.add_argument( "--build_args", metavar="BUILD_ARGS", - default=['--checkout', '-r'], + default=['-r'], nargs=argparse.REMAINDER, help="remaining arguments are treated as arguments to 'ya package' tool" ) diff --git a/ydb/tools/ydbd_slice/handlers.py b/ydb/tools/ydbd_slice/handlers.py index 4311818419..befd86ad4d 100644 --- a/ydb/tools/ydbd_slice/handlers.py +++ b/ydb/tools/ydbd_slice/handlers.py @@ -356,7 +356,12 @@ slice_secrets_path = '/Berkanavt/kikimr/token' def update_kikimr(nodes, bin_path, compressed_path): + bin_directory = os.path.dirname(bin_path) nodes.copy(bin_path, slice_kikimr_path, compressed_path=compressed_path) + for lib in ['libiconv.so', 'liblibaio-dynamic.so', 'liblibidn-dynamic.so']: + lib_path = os.path.join(bin_directory, lib) + remote_lib_path = os.path.join('/lib', lib) + nodes.copy(lib_path, remote_lib_path) def update_cfg(nodes, cfg_path): |