Skip to content

Commit

Permalink
Simplify config filename to config.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
oneonestar authored and mosabua committed Feb 10, 2025
1 parent f06d988 commit 80d058d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ verified and may run into unexpected issues.
Run `./mvnw clean install` to build `trino-gateway`. VM options required for
compilation and testing are specified in `.mvn/jvm.config`.

Edit the configuration file `gateway-ha-config.yml` in the `gateway-ha` folder
Edit the configuration file `config.yaml` in the `gateway-ha` folder
and update the mysql db information.

Note that tests using Oracle are disabled by default on non-x86_64 CPU architectures.
Expand All @@ -36,7 +36,7 @@ will always be run in GitHub CI.

```shell
cd gateway-ha/target/
java -jar gateway-ha-{{VERSION}}-jar-with-dependencies.jar ../gateway-ha-config.yml
java -jar gateway-ha-{{VERSION}}-jar-with-dependencies.jar ../config.yaml
```

#### In Docker
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Find more information in [the related Trino documentation](https://trino.io/docs
After downloading or building the JAR, rename it to `gateway-ha.jar`,
and place it in a directory with read and write access such as `/opt/trinogateway`.

Copy the example config file `gateway-ha-config.yml` from the `gateway-ha/`
Copy the example config file `config.yaml` from the `gateway-ha/`
directory into the same directory, and update the configuration as needed.

Each component of the Trino Gateway has a corresponding node in the
Expand Down Expand Up @@ -229,7 +229,7 @@ JAR and YAML files:

```shell
java -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 \
-jar gateway-ha.jar gateway-ha-config.yml
-jar gateway-ha.jar config.yaml
```

### Helm <a name="helm"></a>
Expand Down Expand Up @@ -299,7 +299,7 @@ configuration.
By default, the Trino Gateway process is started with the following command:

```shell
java -XX:MinRAMPercentage=80.0 -XX:MaxRAMPercentage=80.0 -jar /usr/lib/trino/gateway-ha-jar-with-dependencies.jar /etc/gateway/config.yaml
java -XX:MinRAMPercentage=80.0 -XX:MaxRAMPercentage=80.0 -jar /usr/lib/trino/gateway-ha-jar-with-dependencies.jar config.yaml
```

You can customize details with the `command` node. It accepts a list, that must
Expand Down
4 changes: 2 additions & 2 deletions docs/migration-to-airlift.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ The first arg `server` has been removed.

Old config:
```bash
java -jar gateway-ha.jar server gateway-ha-config.yml
java -jar gateway-ha.jar server config.yaml
```

New config:
```bash
java -jar gateway-ha.jar gateway-ha-config.yml
java -jar gateway-ha.jar config.yaml
```

### Format of `extraWhitelistPaths`
Expand Down
2 changes: 1 addition & 1 deletion docs/routing-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ as a URL. It can implement any dynamic rule changes or other behavior.
### Enabling the routing rules engine

To enable the routing rules engine, find the following lines in
`gateway-ha-config.yml`:
`config.yaml`:

* Set `rulesEngineEnabled` to `true`, then `rulesType` as `FILE` or `EXTERNAL`.
* If you set `rulesType: FILE`, then set `rulesConfigPath` to the path to your
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static void main(String[] args)
mysql.withCopyFileToContainer(forClasspathResource("add_backends_mysql.sql"), "/docker-entrypoint-initdb.d/2-add_backends_mysql.sql");
mysql.setPortBindings(List.of("3306:3306"));
mysql.start();
HaGatewayLauncher.main(new String[] {"gateway-ha/gateway-ha-config.yml"});
HaGatewayLauncher.main(new String[] {"gateway-ha/config.yaml"});

log.info("======== SERVER STARTED ========");
}
Expand Down

0 comments on commit 80d058d

Please sign in to comment.