Skip to content

Commit 61841e0

Browse files
andrii-klandrii-kl
authored
Merge pull request #403 from andrii-kl/feat/improve_env_variables
feat: improve env variables
2 parents d68d0ac + 5d66c6d commit 61841e0

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

‎.env.example

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ REDIS_CONNECTION_CONFIG='{"redis_connection_str":"redis://127.0.0.1:6379/0"}'
88

99
#RocksDB
1010
ROCKS_DB_PATH="/usr/src/rocksdb-data"
11-
ROCKS_DB_PATH_CONTAINER="/usr/src/rocksdb-data"
12-
ROCKS_DB_SECONDARY_PATH_CONTAINER="path/to/rocks/secondary/db"
11+
ROCKS_DB_SECONDARY_PATH="path/to/rocks/secondary/db"
1312
# path to the slots data, required for the backfiller to work
1413
ROCKS_SLOTS_DB_PATH=/path/to/slots-data
1514
ROCKS_SECONDARY_SLOTS_DB_PATH=/path/to/secondary/ingester-slots
1615
ROCKS_ARCHIVES_DIR="path/to/rocks/backup/archives"
1716
ROCKS_BACKUP_ARCHIVES_DIR="path/to/rocks/backup/archives"
17+
ROCKS_BACKUP_URL="127.0.0.1:3051/snapshot"
1818
ROCKS_MIGRATION_STORAGE_PATH=/path/to/migration_storage
1919

2020
#Backfiller
@@ -77,9 +77,9 @@ SKIP_CHECK_TREE_GAPS=false
7777

7878
# API_RPC_HOST INGESTER_RPC_HOST -> RPC_HOST
7979
#INGESTER_ROCKS_DB_PATH -> ROCKS_DB_PATH
80-
#INGESTER_ROCKS_DB_PATH_CONTAINER -> ROCKS_DB_PATH_CONTAINER
80+
#INGESTER_ROCKS_DB_PATH_CONTAINER -> ROCKS_DB_PATH
8181
#INGESTER_SYNCHRONIZER_DUMP_PATH -> ROCKS_DUMP_PATH
82-
#API_ROCKS_DB_PATH_CONTAINER -> ROCKS_DB_PATH_CONTAINER
82+
#API_ROCKS_DB_PATH_CONTAINER -> ROCKS_DB_PATH
8383
#INGESTER_FILE_STORAGE_PATH -> FILE_STORAGE_PATH
8484
#INGESTER_FILE_STORAGE_PATH_CONTAINER -> FILE_STORAGE_PATH_CONTAINER
8585
# INGESTER_PROFILING_FILE_PATH -> PROFILING_FILE_PATH
@@ -96,13 +96,13 @@ SKIP_CHECK_TREE_GAPS=false
9696
#API_DATABASE_CONFIG -> PG_MAX_DB_CONNECTIONS and PG_DATABASE_URL
9797

9898
#SYNCHRONIZER_DUMP_PATH -> ROCKS_DUMP_PATH
99-
#SYNCHRONIZER_ROCKS_DB_SECONDARY_PATH_CONTAINER -> ROCKS_DB_SECONDARY_PATH_CONTAINER
99+
#SYNCHRONIZER_ROCKS_DB_SECONDARY_PATH_CONTAINER -> ROCKS_DB_SECONDARY_PATH
100100
#SYNCHRONIZER_DUMP_SYNCHRONIZER_BATCH_SIZE -> DUMP_SYNCHRONIZER_BATCH_SIZE
101101
#SYNCHRONIZER_DUMP_SYNC_THRESHOLD -> DUMP_SYNC_THRESHOLD
102102

103103
#API_ARCHIVES_DIR -> rocks_archives_dir
104-
#API_ROCKS_DB_PATH_CONTAINER -> ROCKS_DB_PATH_CONTAINER
105-
#API_ROCKS_DB_SECONDARY_PATH_CONTAINER -> ROCKS_DB_SECONDARY_PATH_CONTAINER
104+
#API_ROCKS_DB_PATH_CONTAINER -> ROCKS_DB_PATH
105+
#API_ROCKS_DB_SECONDARY_PATH_CONTAINER -> ROCKS_DB_SECONDARY_PATH
106106
#API_FILE_STORAGE_PATH_CONTAINER -> FILE_STORAGE_PATH_CONTAINER
107107
#API_JSON_MIDDLEWARE_CONFIG -> JSON_MIDDLEWARE_CONFIG
108108
#API_CONSISTENCE_SYNCHRONIZATION_API_THRESHOLD - > CONSISTENCE_SYNCHRONIZATION_API_THRESHOLD

‎docker-compose.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
- .env
99
network_mode: host
1010
volumes:
11-
- ${ROCKS_DB_PATH}:${ROCKS_DB_PATH_CONTAINER}:rw
11+
- ${ROCKS_DB_PATH}:${ROCKS_DB_PATH}:rw
1212
- ${ROCKS_DUMP_PATH:-/tmp/rocks_dump}:${ROCKS_DUMP_PATH:-/tmp/rocks_dump}:rw
1313
- ${ROCKS_BACKUP_DIR}:${ROCKS_BACKUP_DIR}:rw
1414
- ${ROCKS_BACKUP_ARCHIVES_DIR}:${ROCKS_BACKUP_ARCHIVES_DIR}:rw
@@ -40,8 +40,8 @@ services:
4040
- .env
4141
network_mode: host
4242
volumes:
43-
- ${ROCKS_DB_PATH_CONTAINER}:${ROCKS_DB_PATH_CONTAINER}:ro
44-
- ${ROCKS_DB_SECONDARY_PATH_CONTAINER}/api:${ROCKS_DB_SECONDARY_PATH_CONTAINER}:rw
43+
- ${ROCKS_DB_PATH}:${ROCKS_DB_PATH}:ro
44+
- ${ROCKS_DB_SECONDARY_PATH}/api:${ROCKS_DB_SECONDARY_PATH}:rw
4545
- ${ROCKS_ARCHIVES_DIR}:${ROCKS_ARCHIVES_DIR}:ro
4646
- ${FILE_STORAGE_PATH}:${FILE_STORAGE_PATH_CONTAINER}:rw
4747
- ./heaps:/usr/src/app/heaps:rw
@@ -64,9 +64,9 @@ services:
6464
- .env
6565
network_mode: host
6666
volumes:
67-
- ${ROCKS_DB_PATH}:${ROCKS_DB_PATH_CONTAINER}:rw
67+
- ${ROCKS_DB_PATH}:${ROCKS_DB_PATH}:rw
6868
- ${ROCKS_DUMP_PATH:-/tmp/rocks_dump}:${ROCKS_DUMP_PATH:-/tmp/rocks_dump}:rw
69-
- ${ROCKS_DB_SECONDARY_PATH_CONTAINER}/synchronizer:${ROCKS_DB_SECONDARY_PATH_CONTAINER}:rw
69+
- ${ROCKS_DB_SECONDARY_PATH}/synchronizer:${ROCKS_DB_SECONDARY_PATH}:rw
7070
- ./heaps:/usr/src/app/heaps:rw
7171
- ./migrations:/usr/src/app/migrations
7272
depends_on:
@@ -176,10 +176,10 @@ services:
176176
- .env
177177
network_mode: host
178178
volumes:
179-
- ${ROCKS_DB_PATH}:${ROCKS_DB_PATH_CONTAINER}:ro
179+
- ${ROCKS_DB_PATH}:${ROCKS_DB_PATH}:ro
180180
- ${ROCKS_BACKUP_DIR}:${ROCKS_BACKUP_DIR}:rw
181181
- ${ROCKS_BACKUP_ARCHIVES_DIR}:${ROCKS_BACKUP_ARCHIVES_DIR}:rw
182-
- ${ROCKS_DB_SECONDARY_PATH}/backup:${ROCKS_DB_SECONDARY_PATH_CONTAINER}:rw
182+
- ${ROCKS_DB_SECONDARY_PATH}/backup:${ROCKS_DB_SECONDARY_PATH}:rw
183183
build:
184184
context: .
185185
dockerfile: docker/app.Dockerfile

‎nft_ingester/scripts/run_api.bash

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export RUST_LOG=info
22
export RUST_BACKTRACE=1
33
export API_DATABASE_CONFIG='{max_postgres_connections=250, url="postgres://solana:solana@localhost:5432/v3"}'
4-
export API_ROCKS_DB_PATH_CONTAINER="/rocksdb/rocksdb-data"
5-
export API_ROCKS_DB_SECONDARY_PATH_CONTAINER="/rocksdb/secondary-api-rocksdb-data"
4+
export API_ROCKS_DB_PATH="/rocksdb/rocksdb-data"
5+
export API_ROCKS_DB_SECONDARY_PATH="/rocksdb/secondary-api-rocksdb-data"
66
export API_ROCKS_SYNC_INTERVAL_SECONDS=2
77
export API_METRICS_PORT=8985
88
export API_SERVER_PORT=8990

‎nft_ingester/src/api/dapi/asset.rs

+1
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ pub async fn get_by_ids<
219219
let mut asset_selected_maps = rocks_db
220220
.get_asset_selected_maps_async(unique_asset_ids.clone(), owner_address, &options)
221221
.await?;
222+
222223
if let Some(json_downloader) = json_downloader {
223224
let mut urls_to_download = Vec::new();
224225

‎nft_ingester/src/bin/api/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub async fn main() -> Result<(), IngesterError> {
7070
let mutexed_tasks = Arc::new(Mutex::new(tasks));
7171

7272
let storage = Storage::open_secondary(
73-
&args.rocks_db_path_container,
73+
&args.rocks_db_path,
7474
&args.rocks_db_secondary_path,
7575
mutexed_tasks.clone(),
7676
red_metrics.clone(),

‎nft_ingester/src/bin/ingester/main.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ pub async fn main() -> Result<(), IngesterError> {
123123
),
124124
)
125125
.expect("invalid rocks backup archives dir"),
126-
&PathBuf::from_str(&args.rocks_db_path_container)
127-
.expect("invalid rocks backup archives dir"),
126+
&PathBuf::from_str(&args.rocks_db_path).expect("invalid rocks backup archives dir"),
128127
)
129128
.await?;
130129
}
@@ -135,7 +134,7 @@ pub async fn main() -> Result<(), IngesterError> {
135134
info!("Init primary storage...");
136135
let primary_rocks_storage = Arc::new(
137136
init_primary_storage(
138-
&args.rocks_db_path_container,
137+
&args.rocks_db_path,
139138
args.enable_rocks_migration.unwrap_or(false),
140139
&args.rocks_migration_storage_path,
141140
&metrics_state,

‎nft_ingester/src/bin/rocksdb_backup/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ async fn main() -> Result<(), RocksDbBackupServiceError> {
2727
let mutexed_tasks = Arc::new(Mutex::new(tasks));
2828

2929
let storage = Storage::open_secondary(
30-
&args.rocks_db_path_container,
30+
&args.rocks_db_path,
3131
&args.rocks_db_secondary_path,
3232
mutexed_tasks.clone(),
3333
red_metrics.clone(),
@@ -36,7 +36,7 @@ async fn main() -> Result<(), RocksDbBackupServiceError> {
3636
.unwrap();
3737

3838
debug!(
39-
rocks_db_path_container = ?args.rocks_db_path_container,
39+
rocks_db_path_container = ?args.rocks_db_path,
4040
rocks_db_secondary_path = ?args.rocks_db_secondary_path,
4141
"Opened RocksDb in secondary mode"
4242
);

‎nft_ingester/src/bin/synchronizer/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pub async fn main() -> Result<(), IngesterError> {
6161
let mutexed_tasks = Arc::new(Mutex::new(tasks));
6262

6363
let storage = Storage::open_secondary(
64-
&args.rocks_db_path_container,
64+
&args.rocks_db_path,
6565
&args.rocks_db_secondary_path,
6666
mutexed_tasks.clone(),
6767
red_metrics.clone(),

‎nft_ingester/src/config.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct IngesterClapArgs {
2727
default_value = "./my_rocksdb",
2828
help = "Rocks db path container"
2929
)]
30-
pub rocks_db_path_container: String,
30+
pub rocks_db_path: String,
3131

3232
#[clap(
3333
short('f'),
@@ -284,7 +284,7 @@ pub struct SynchronizerClapArgs {
284284
default_value = "./my_rocksdb",
285285
help = "Rocks db path container"
286286
)]
287-
pub rocks_db_path_container: String,
287+
pub rocks_db_path: String,
288288
#[clap(
289289
long,
290290
env,
@@ -335,7 +335,7 @@ pub struct SynchronizerClapArgs {
335335
#[command(author, version, about, long_about = None)]
336336
pub struct RocksDbBackupServiceClapArgs {
337337
#[clap(long, env, default_value = "./my_rocksdb", help = "Rocks db path container")]
338-
pub rocks_db_path_container: PathBuf,
338+
pub rocks_db_path: PathBuf,
339339
#[clap(long, env, default_value = "./my_rocksdb_secondary", help = "Rocks db secondary path")]
340340
pub rocks_db_secondary_path: PathBuf,
341341
#[clap(long, env = "ROCKS_BACKUP_ARCHIVES_DIR", help = "Rocks backup archives dir")]
@@ -419,7 +419,7 @@ pub struct ApiClapArgs {
419419
default_value = "./my_rocksdb",
420420
help = "Rocks db path container"
421421
)]
422-
pub rocks_db_path_container: String,
422+
pub rocks_db_path: String,
423423
#[clap(
424424
long,
425425
env,
@@ -615,7 +615,7 @@ mod tests {
615615
"{}",
616616
]);
617617

618-
assert_eq!(args.rocks_db_path_container, "./my_rocksdb");
618+
assert_eq!(args.rocks_db_path, "./my_rocksdb");
619619
assert_eq!(args.file_storage_path_container, "./tmp/file_storage");
620620
assert_eq!(args.pg_max_db_connections, 100);
621621
assert_eq!(args.sequence_consistent_checker_wait_period_sec, 60);
@@ -647,7 +647,7 @@ mod tests {
647647

648648
assert_eq!(args.rocks_dump_path, "./tmp/rocks_dump");
649649
assert_eq!(args.pg_max_db_connections, 100);
650-
assert_eq!(args.rocks_db_path_container, "./my_rocksdb");
650+
assert_eq!(args.rocks_db_path, "./my_rocksdb");
651651
assert_eq!(args.rocks_db_secondary_path, "./my_rocksdb_secondary");
652652
assert_eq!(args.run_profiling, false);
653653
assert_eq!(args.heap_path, "/usr/src/app/heaps");
@@ -668,7 +668,7 @@ mod tests {
668668
"postgres://solana:solana@localhost:5432/aura_db",
669669
]);
670670

671-
assert_eq!(args.rocks_db_path_container, "./my_rocksdb");
671+
assert_eq!(args.rocks_db_path, "./my_rocksdb");
672672
assert_eq!(args.rocks_db_secondary_path, "./my_rocksdb_secondary");
673673
assert_eq!(args.rocks_sync_interval_seconds, 2);
674674
assert_eq!(args.heap_path, "/usr/src/app/heaps");

0 commit comments

Comments
 (0)