diff --git a/docs/src/user-docs/guides-using-presto.md b/docs/src/user-docs/guides-using-presto.md index c68434dcfb..48ea7a00a8 100644 --- a/docs/src/user-docs/guides-using-presto.md +++ b/docs/src/user-docs/guides-using-presto.md @@ -16,7 +16,7 @@ been merged into the main Presto repository so that you can use official Presto ## Requirements -* [CLP][clp-releases] (clp-json) v0.4.0 or higher +* [CLP][clp-releases] (clp-json) v0.5.0 or higher * [Docker] v28 or higher * [Docker Compose][docker-compose] v2.20.2 or higher * Python @@ -31,7 +31,7 @@ Using Presto with CLP requires: ### Setting up CLP -1. Follow the [quick-start](./quick-start/index.md) guide to download and extract the CLP package, +1. Follow the [quick-start](quick-start/index.md) guide to download and extract the CLP package, but don't start the package just yet. 2. Before starting the package, update the package's config as follows: @@ -55,7 +55,15 @@ Using Presto with CLP requires: deployment infrastructure. ::: -3. Continue following the [quick-start](./quick-start/index.md#using-clp) guide to start CLP and +3. If you'd like to store your compressed logs on S3, follow the + [using object storage](guides-using-object-storage/index.md) guide. + + :::{note} + Currently, the Presto integration only supports the + [credentials](guides-using-object-storage/clp-config.md#credentials) authentication type. + ::: + +4. Continue following the [quick-start](./quick-start/index.md#using-clp) guide to start CLP and compress your logs. A sample dataset that works well with Presto is [postgresql]. ### Setting up Presto @@ -78,7 +86,7 @@ Using Presto with CLP requires: 4. Configure Presto to use CLP's metadata database as follows: - * Open and edit `coordinator/config-template/metadata-filter.json`. + * Open and edit `coordinator/config-template/split-filter.json`. * For each dataset you want to query, add a filter config of the form: ```json @@ -86,9 +94,11 @@ Using Presto with CLP requires: "clp.default.": [ { "columnName": "", - "rangeMapping": { - "lowerBound": "begin_timestamp", - "upperBound": "end_timestamp" + "customOptions": { + "rangeMapping": { + "lowerBound": "begin_timestamp", + "upperBound": "end_timestamp" + } }, "required": false } @@ -108,7 +118,7 @@ Using Presto with CLP requires: docker compose up ``` - * To use more than Presto worker, you can use the `--scale` option as follows: + * To use more than one Presto worker, you can use the `--scale` option as follows: ```bash docker compose up --scale presto-worker= @@ -143,8 +153,20 @@ Each dataset in CLP shows up as a table in Presto. To show all available dataset SHOW TABLES; ``` +:::{note} If you didn't specify a dataset when compressing your logs in CLP, your logs will have been stored -in the `default` dataset. To query the logs in this dataset: +in the `default` dataset. +::: + +To show all available columns in the `default` dataset: + +```sql +DESCRIBE default; +``` + +If you wish to show the columns of a different dataset, replace `default` above. + +To query the logs in this dataset: ```sql SELECT * FROM default LIMIT 1; @@ -164,11 +186,10 @@ The Presto CLP integration has the following limitations at present: * Nested fields containing special characters cannot be queried (see [y-scope/presto#8]). Allowed characters are alphanumeric characters and underscores. To get around this limitation, you'll need to preprocess your logs to remove any special characters. -* Only logs stored on the filesystem, rather than S3, can be queried through Presto. These limitations will be addressed in a future release of the Presto integration. -[clp-connector-docs]: https://docs.yscope.com/presto/connector/clp.html#metadata-filter-config-file +[clp-connector-docs]: https://docs.yscope.com/presto/connector/clp.html#split-filter-config-file [clp-releases]: https://github.com/y-scope/clp/releases [docker-compose]: https://docs.docker.com/compose/install/ [Docker]: https://docs.docker.com/engine/install/ diff --git a/tools/deployment/presto-clp/.gitignore b/tools/deployment/presto-clp/.gitignore new file mode 100644 index 0000000000..50e6da86f2 --- /dev/null +++ b/tools/deployment/presto-clp/.gitignore @@ -0,0 +1 @@ +/worker/config-template/clp.properties diff --git a/tools/deployment/presto-clp/coordinator.env b/tools/deployment/presto-clp/coordinator.env index c246fc7003..21d275fa18 100644 --- a/tools/deployment/presto-clp/coordinator.env +++ b/tools/deployment/presto-clp/coordinator.env @@ -1,5 +1,6 @@ # clp.properties PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_PROVIDER_TYPE=mysql +PRESTO_COORDINATOR_CLPPROPERTIES_SPLIT_FILTER_PROVIDER_TYPE=mysql PRESTO_COORDINATOR_CLPPROPERTIES_SPLIT_PROVIDER=mysql # config.properties diff --git a/tools/deployment/presto-clp/coordinator/config-template/clp.properties b/tools/deployment/presto-clp/coordinator/config-template/clp.properties index cefee52d39..b1e27b026c 100644 --- a/tools/deployment/presto-clp/coordinator/config-template/clp.properties +++ b/tools/deployment/presto-clp/coordinator/config-template/clp.properties @@ -6,4 +6,5 @@ clp.metadata-db-user=${PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_USER} clp.metadata-db-password=${PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_PASSWORD} clp.metadata-table-prefix=${PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_TABLE_PREFIX} clp.split-provider-type=${PRESTO_COORDINATOR_CLPPROPERTIES_SPLIT_PROVIDER} -clp.metadata-filter-config=/opt/presto-server/etc/metadata-filter.json +clp.split-filter-provider-type=${PRESTO_COORDINATOR_CLPPROPERTIES_SPLIT_FILTER_PROVIDER_TYPE} +clp.split-filter-config=/opt/presto-server/etc/split-filter.json diff --git a/tools/deployment/presto-clp/coordinator/config-template/metadata-filter.json b/tools/deployment/presto-clp/coordinator/config-template/split-filter.json similarity index 100% rename from tools/deployment/presto-clp/coordinator/config-template/metadata-filter.json rename to tools/deployment/presto-clp/coordinator/config-template/split-filter.json diff --git a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py b/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py deleted file mode 100644 index 470b09c048..0000000000 --- a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py +++ /dev/null @@ -1,187 +0,0 @@ -import argparse -import logging -import sys -from pathlib import Path -from typing import Dict, Optional - -import yaml -from dotenv import dotenv_values - -# Set up console logging -logging_console_handler = logging.StreamHandler() -logging_formatter = logging.Formatter( - "%(asctime)s.%(msecs)03d %(levelname)s [%(module)s] %(message)s", datefmt="%Y-%m-%dT%H:%M:%S" -) -logging_console_handler.setFormatter(logging_formatter) - -# Set up root logger -root_logger = logging.getLogger() -root_logger.setLevel(logging.INFO) -root_logger.addHandler(logging_console_handler) - -# Create logger -logger = logging.getLogger(__name__) - - -def main(argv=None) -> int: - if argv is None: - argv = sys.argv - - args_parser = argparse.ArgumentParser( - description="Generates an environment variables file for any user-configured properties." - ) - args_parser.add_argument( - "--clp-package-dir", help="CLP package directory.", required=True, type=Path - ) - args_parser.add_argument( - "--output-file", help="Path for the environment variables file.", required=True, type=Path - ) - - parsed_args = args_parser.parse_args(argv[1:]) - clp_package_dir: Path = parsed_args.clp_package_dir.resolve() - output_file: Path = parsed_args.output_file - - env_vars: Dict[str, str] = {} - if not _add_clp_env_vars(clp_package_dir, env_vars): - return 1 - - script_dir = Path(__file__).parent.resolve() - if not _add_worker_env_vars(script_dir.parent / "coordinator-common.env", env_vars): - return 1 - - with open(output_file, "w") as output_file_handle: - for key, value in env_vars.items(): - output_file_handle.write(f"{key}={value}\n") - - return 0 - - -def _add_clp_env_vars(clp_package_dir: Path, env_vars: Dict[str, str]) -> bool: - """ - Adds environment variables for CLP config values to `env_vars`. - - :param clp_package_dir: - :param env_vars: - :return: Whether the environment variables were successfully added. - """ - env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_TABLE_PREFIX"] = "clp_" - - clp_config_file_path = clp_package_dir / "etc" / "clp-config.yml" - if not clp_config_file_path.exists(): - logger.error( - "'%s' doesn't exist. Is '%s' the location of the CLP package?", - clp_config_file_path, - clp_package_dir.resolve(), - ) - return False - - with open(clp_config_file_path, "r") as clp_config_file: - clp_config = yaml.safe_load(clp_config_file) - - database_type = _get_config_value(clp_config, "database.type", "mariadb") - if "mariadb" != database_type and "mysql" != database_type: - logger.error( - "CLP's database.type must be either mariadb or mysql but found '%s'. Presto" - " currently only supports reading metadata from a mariadb or mysql database.", - database_type, - ) - return False - - database_host = _get_config_value(clp_config, "database.host", "localhost") - database_port = _get_config_value(clp_config, "database.port", str(3306)) - database_name = _get_config_value(clp_config, "database.name", "clp-db") - env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_URL"] = ( - f"jdbc:mysql://{database_host}:{database_port}" - ) - env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_NAME"] = database_name - - clp_archive_output_storage_type = _get_config_value( - clp_config, "archive_output.storage.type", "fs" - ) - if "fs" != clp_archive_output_storage_type: - logger.error( - "Expected CLP's archive_output.storage.type to be fs but found '%s'. Presto" - " currently only supports reading archives from the fs storage type.", - clp_archive_output_storage_type, - ) - return False - - clp_archives_dir = _get_config_value( - clp_config, - "archive_output.storage.directory", - str(clp_package_dir / "var" / "data" / "archives"), - ) - if Path(clp_archives_dir).is_absolute(): - env_vars["CLP_ARCHIVES_DIR"] = clp_archives_dir - else: - env_vars["CLP_ARCHIVES_DIR"] = str(clp_package_dir / clp_archives_dir) - - credentials_file_path = clp_package_dir / "etc" / "credentials.yml" - if not credentials_file_path.exists(): - logger.error("'%s' doesn't exist. Did you start CLP?", credentials_file_path) - return False - - with open(credentials_file_path, "r") as credentials_file: - credentials = yaml.safe_load(credentials_file) - - database_user = _get_config_value(credentials, "database.user") - database_password = _get_config_value(credentials, "database.password") - if not database_user or not database_password: - logger.error( - "database.user and database.password must be specified in '%s'.", credentials_file_path - ) - return False - env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_USER"] = database_user - env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_PASSWORD"] = database_password - - return True - - -def _add_worker_env_vars(coordinator_common_env_file_path: Path, env_vars: Dict[str, str]) -> bool: - """ - Adds environment variables for worker config values to `env_vars`. - - :param coordinator_common_env_file_path: - :param env_vars: - :return: Whether the environment variables were successfully added. - """ - config = dotenv_values(coordinator_common_env_file_path) - - try: - env_vars["PRESTO_COORDINATOR_CONFIGPROPERTIES_DISCOVERY_URI"] = ( - f'http://{config["PRESTO_COORDINATOR_SERVICENAME"]}' - f':{config["PRESTO_COORDINATOR_HTTPPORT"]}' - ) - except KeyError as e: - logger.error( - "Missing required key '%s' in '%s'", - e, - coordinator_common_env_file_path, - ) - return False - - return True - - -def _get_config_value(config: dict, key: str, default_value: Optional[str] = None) -> str: - """ - Gets the value corresponding to `key` from `config` if it exists. - - :param config: The config. - :param key: The key to look for in the config, in dot notation (e.g., "database.host"). - :param default_value: The value to return if `key` doesn't exist in `config`. - :return: The value corresponding to `key` if it exists, otherwise `default_value`. - """ - - keys = key.split(".") - value = config - for k in keys: - if isinstance(value, dict) and k in value: - value = value[k] - else: - return default_value - return value - - -if "__main__" == __name__: - sys.exit(main(sys.argv)) diff --git a/tools/deployment/presto-clp/scripts/init.py b/tools/deployment/presto-clp/scripts/init.py new file mode 100644 index 0000000000..f2148e6d2f --- /dev/null +++ b/tools/deployment/presto-clp/scripts/init.py @@ -0,0 +1,337 @@ +import argparse +import logging +import sys +from pathlib import Path +from typing import Any, Dict, Optional + +import yaml +from dotenv import dotenv_values + +# Set up console logging +logging_console_handler = logging.StreamHandler() +logging_formatter = logging.Formatter( + "%(asctime)s.%(msecs)03d %(levelname)s [%(module)s] %(message)s", datefmt="%Y-%m-%dT%H:%M:%S" +) +logging_console_handler.setFormatter(logging_formatter) + +# Set up root logger +root_logger = logging.getLogger() +root_logger.setLevel(logging.INFO) +root_logger.addHandler(logging_console_handler) + +# Create logger +logger = logging.getLogger(__name__) + + +def main(argv=None) -> int: + if argv is None: + argv = sys.argv + + args_parser = argparse.ArgumentParser( + description=( + "Generates any necessary config files corresponding to user-configured properties." + ) + ) + args_parser.add_argument( + "--clp-package-dir", help="CLP package directory.", required=True, type=Path + ) + args_parser.add_argument( + "--output-file", help="Path for the environment variables file.", required=True, type=Path + ) + + parsed_args = args_parser.parse_args(argv[1:]) + clp_package_dir: Path = parsed_args.clp_package_dir.resolve() + output_file: Path = parsed_args.output_file + + clp_config_file_path = clp_package_dir / "etc" / "clp-config.yml" + if not clp_config_file_path.exists(): + logger.error( + "'%s' doesn't exist. Is '%s' the location of the CLP package?", + clp_config_file_path, + clp_package_dir.resolve(), + ) + return 1 + + with open(clp_config_file_path, "r") as clp_config_file: + clp_config = yaml.safe_load(clp_config_file) + + env_vars: Dict[str, str] = {} + if not _add_clp_env_vars(clp_config, clp_config_file_path, clp_package_dir, env_vars): + return 1 + + script_dir = Path(__file__).parent.resolve() + if not _add_worker_env_vars(script_dir.parent / "coordinator-common.env", env_vars): + return 1 + + if not _generate_worker_clp_properties( + script_dir.parent / "worker" / "config-template", env_vars + ): + return 1 + + with open(output_file, "w") as output_file_handle: + for key, value in env_vars.items(): + output_file_handle.write(f"{key}={value}\n") + + return 0 + + +def _add_clp_env_vars( + clp_config: Dict[str, Any], + clp_config_file_path: Path, + clp_package_dir: Path, + env_vars: Dict[str, str], +) -> bool: + """ + Adds environment variables for CLP config values to `env_vars`. + + :param clp_config: + :param clp_config_file_path: Path to the file containing `clp_config`, for logging. + :param clp_package_dir: + :param env_vars: + :return: Whether the environment variables were successfully added. + """ + env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_TABLE_PREFIX"] = "clp_" + + database_type = _get_config_value(clp_config, "database.type", "mariadb") + if "mariadb" != database_type and "mysql" != database_type: + logger.error( + "CLP's database.type must be either mariadb or mysql but found '%s'. Presto" + " currently only supports reading metadata from a mariadb or mysql database.", + database_type, + ) + return False + + database_host = _get_config_value(clp_config, "database.host", "localhost") + database_port = _get_config_value(clp_config, "database.port", 3306) + database_name = _get_config_value(clp_config, "database.name", "clp-db") + env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_URL"] = ( + f"jdbc:mysql://{database_host}:{database_port}" + ) + env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_NAME"] = database_name + + clp_archive_output_storage_type = _get_config_value( + clp_config, "archive_output.storage.type", "fs" + ) + archive_output_storage_key = "archive_output.storage" + env_vars["PRESTO_WORKER_CLPPROPERTIES_STORAGE_TYPE"] = clp_archive_output_storage_type + if "fs" == clp_archive_output_storage_type: + env_vars["CLP_ARCHIVES_DIR"] = str( + _get_path_clp_config_value( + clp_config, + f"{archive_output_storage_key}.directory", + Path("var") / "data" / "archives", + clp_package_dir, + ) + ) + elif "s3" == clp_archive_output_storage_type: + env_vars["CLP_ARCHIVES_DIR"] = str( + _get_path_clp_config_value( + clp_config, + f"{archive_output_storage_key}.staging_directory", + Path("var") / "data" / "staged-archives", + clp_package_dir, + ) + ) + + if not _add_clp_s3_env_vars(clp_config, clp_config_file_path, env_vars): + return False + else: + logger.error( + "'%s' for %s is unsupported.", + clp_archive_output_storage_type, + archive_output_storage_key, + ) + return False + + credentials_file_path = clp_package_dir / "etc" / "credentials.yml" + if not credentials_file_path.exists(): + logger.error("'%s' doesn't exist. Did you start CLP?", credentials_file_path) + return False + + with open(credentials_file_path, "r") as credentials_file: + credentials = yaml.safe_load(credentials_file) + + try: + database_user = _get_required_config_value( + credentials, "database.user", credentials_file_path + ) + database_password = _get_required_config_value( + credentials, "database.password", credentials_file_path + ) + except KeyError: + return False + env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_USER"] = database_user + env_vars["PRESTO_COORDINATOR_CLPPROPERTIES_METADATA_DATABASE_PASSWORD"] = database_password + + return True + + +def _add_clp_s3_env_vars( + clp_config: Dict[str, Any], clp_config_file_path: Path, env_vars: Dict[str, str] +) -> bool: + """ + Adds environment variables for CLP S3 config values to `env_vars`. + + :param clp_config: + :param clp_config_file_path: Path to the file containing `clp_config`, for logging. + :param env_vars: + :return: Whether the environment variables were successfully added. + """ + try: + s3_config_key = f"archive_output.storage.s3_config" + s3_bucket = _get_required_config_value( + clp_config, f"{s3_config_key}.bucket", clp_config_file_path + ) + s3_region_code = _get_required_config_value( + clp_config, f"{s3_config_key}.region_code", clp_config_file_path + ) + + aws_auth_key = f"{s3_config_key}.aws_authentication" + aws_auth_type_key = f"{aws_auth_key}.type" + aws_auth_type = _get_required_config_value( + clp_config, aws_auth_type_key, clp_config_file_path + ) + credentials_auth_type_str = "credentials" + if credentials_auth_type_str != aws_auth_type: + logger.error("'%s' for %s is unsupported.", aws_auth_type, aws_auth_type_key) + return False + + s3_credentials_key = f"{aws_auth_key}.{credentials_auth_type_str}" + s3_access_key_id = _get_required_config_value( + clp_config, f"{s3_credentials_key}.access_key_id", clp_config_file_path + ) + s3_secret_access_key = _get_required_config_value( + clp_config, f"{s3_credentials_key}.secret_access_key", clp_config_file_path + ) + except KeyError: + return False + + env_vars["PRESTO_WORKER_CLPPROPERTIES_S3_AUTH_PROVIDER"] = "clp_package" + env_vars["PRESTO_WORKER_CLPPROPERTIES_S3_ACCESS_KEY_ID"] = s3_access_key_id + s3_end_point = f"https://{s3_bucket}.s3.{s3_region_code}.amazonaws.com/" + env_vars["PRESTO_WORKER_CLPPROPERTIES_S3_END_POINT"] = s3_end_point + env_vars["PRESTO_WORKER_CLPPROPERTIES_S3_SECRET_ACCESS_KEY"] = s3_secret_access_key + + return True + + +def _add_worker_env_vars(coordinator_common_env_file_path: Path, env_vars: Dict[str, str]) -> bool: + """ + Adds environment variables for worker config values to `env_vars`. + + :param coordinator_common_env_file_path: + :param env_vars: + :return: Whether the environment variables were successfully added. + """ + config = dotenv_values(coordinator_common_env_file_path) + + try: + env_vars["PRESTO_COORDINATOR_CONFIGPROPERTIES_DISCOVERY_URI"] = ( + f'http://{config["PRESTO_COORDINATOR_SERVICENAME"]}' + f':{config["PRESTO_COORDINATOR_HTTPPORT"]}' + ) + except KeyError as e: + logger.error( + "Missing required key %s in '%s'", + e, + coordinator_common_env_file_path, + ) + return False + + return True + + +def _generate_worker_clp_properties( + worker_config_template_path: Path, env_vars: Dict[str, str] +) -> bool: + """ + Generates a clp.properties file for the worker. + + :param worker_config_template_path: + :param env_vars: + :return: Whether the clp.properties file was successfully generated. + """ + properties = ["connector.name=clp"] + if "s3" == env_vars.get("PRESTO_WORKER_CLPPROPERTIES_STORAGE_TYPE"): + property_name_to_env_var_name = { + "clp.storage-type": "PRESTO_WORKER_CLPPROPERTIES_STORAGE_TYPE", + "clp.s3-auth-provider": "PRESTO_WORKER_CLPPROPERTIES_S3_AUTH_PROVIDER", + "clp.s3-access-key-id": "PRESTO_WORKER_CLPPROPERTIES_S3_ACCESS_KEY_ID", + "clp.s3-end-point": "PRESTO_WORKER_CLPPROPERTIES_S3_END_POINT", + "clp.s3-secret-access-key": "PRESTO_WORKER_CLPPROPERTIES_S3_SECRET_ACCESS_KEY", + } + + for property_name, env_var_name in property_name_to_env_var_name.items(): + env_var_value = env_vars.get(env_var_name) + if not env_var_value: + logger.error("Internal error: Missing required env var '%s'", env_var_name) + return False + properties.append(f"{property_name}={env_var_value}") + + with open(worker_config_template_path / "clp.properties", "w", encoding="utf-8") as f: + f.write("\n".join(properties) + "\n") + + return True + + +def _get_path_clp_config_value( + clp_config: Dict[str, Any], key: str, default_value: Path, clp_package_dir: Path +) -> Path: + """ + Gets the value corresponding to `key` from `clp_config` as a `Path`. + + :param clp_config: + :param key: The key to look for in the config, in dot notation (e.g., "database.host"). + :param default_value: Value to use if the key is missing. + :param clp_package_dir: Base directory for resolving relative paths in `clp_config`. + :return: The value as a `Path`; relative values resolve to `clp_package_dir` / . + """ + value = _get_config_value(clp_config, key, str(default_value)) + value_as_path = Path(value) + if value_as_path.is_absolute(): + return value_as_path + else: + return clp_package_dir / value_as_path + + +def _get_required_config_value(config: Dict[str, Any], key: str, config_file_path: Path) -> str: + """ + Gets the value corresponding to `key` from `config`. Logs an error on failure. + + :param config: The config. + :param key: The key to look for in the config, in dot notation (e.g., "database.host"). + :param config_file_path: The path to the config file, for logging. + :return: The value corresponding to `key`. + :raises KeyError: If `key` doesn't exist in `config` or its value is `None`. + """ + value = _get_config_value(config, key) + if value is None: + logger.error("Required config '%s' is missing or null in '%s'.", key, config_file_path) + raise KeyError(key) + return value + + +def _get_config_value( + config: Dict[str, Any], key: str, default_value: Optional[Any] = None +) -> Optional[Any]: + """ + Gets the value corresponding to `key` from `config` if it exists. + + :param config: The config. + :param key: The key to look for in the config, in dot notation (e.g., "database.host"). + :param default_value: The value to return if `key` doesn't exist in `config`. + :return: The value corresponding to `key` if it exists, otherwise `default_value`. + """ + + keys = key.split(".") + value = config + for k in keys: + if isinstance(value, dict) and k in value: + value = value[k] + else: + return default_value + return value + + +if "__main__" == __name__: + sys.exit(main(sys.argv)) diff --git a/tools/deployment/presto-clp/scripts/set-up-config.sh b/tools/deployment/presto-clp/scripts/set-up-config.sh index 6c6fb8cced..9259dd9f9b 100755 --- a/tools/deployment/presto-clp/scripts/set-up-config.sh +++ b/tools/deployment/presto-clp/scripts/set-up-config.sh @@ -22,7 +22,7 @@ source "${script_dir}/.venv/bin/activate" echo "Installing required Python packages..." pip3 install -r "${script_dir}/requirements.txt" -echo "Generating environment variables file for user-configured properties..." -python3 "${script_dir}/generate-user-env-vars-file.py" \ +echo "Generating config files corresponding to user-configured properties..." +python3 "${script_dir}/init.py" \ --clp-package-dir "${clp_package_dir}" \ --output-file "${script_dir}/../.env" diff --git a/tools/deployment/presto-clp/worker/config-template/clp.properties b/tools/deployment/presto-clp/worker/config-template/clp.properties deleted file mode 100644 index 4ec6f9a4c7..0000000000 --- a/tools/deployment/presto-clp/worker/config-template/clp.properties +++ /dev/null @@ -1 +0,0 @@ -connector.name=clp