Skip to content

Commit 33edb81

Browse files
authored
fix: set new node's available = capacity (#2111)
Closes STOR-507
1 parent 88e7eb9 commit 33edb81

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

tokenserver-db/src/tests.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ async fn test_init_sync15_node() -> DbResult<()> {
432432

433433
assert_eq!(node.node, "https://testo.example.gg");
434434
assert_eq!(node.capacity, 38383);
435-
assert_eq!(node.available, 1);
435+
assert_eq!(node.available, 38383);
436436
assert_eq!(node.current_load, 0);
437437

438438
Ok(())
@@ -474,6 +474,7 @@ async fn test_init_sync15_node_with_default_capacity() -> DbResult<()> {
474474

475475
assert_eq!(node.node, "https://testo.example.gg");
476476
assert_eq!(node.capacity, 100000);
477+
assert_eq!(node.available, 100000);
477478

478479
Ok(())
479480
},

tokenserver-mysql/src/db/db_impl.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ impl Db for TokenserverDb {
383383
INSERT IGNORE INTO nodes (service, node, available, current_load, capacity, downed, backoff)
384384
VALUES (
385385
(SELECT id FROM services WHERE service = '{}'),
386-
?, 1, 0, ?, 0, 0
386+
?, ?, 0, ?, 0, 0
387387
)
388388
"#,
389389
params::Sync15Node::SERVICE_NAME
@@ -392,6 +392,7 @@ impl Db for TokenserverDb {
392392
let affected_rows = diesel::sql_query(query)
393393
.bind::<Text, _>(&params.node)
394394
.bind::<Integer, _>(params.capacity)
395+
.bind::<Integer, _>(params.capacity)
395396
.execute(&mut self.conn)
396397
.await?;
397398

tokenserver-postgres/src/db/db_impl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ impl Db for TokenserverPgDb {
7070
async fn insert_sync15_node(&mut self, params: params::Sync15Node) -> DbResult<bool> {
7171
let query = format!(
7272
r#"
73-
INSERT INTO nodes (service, node, available, current_load, capacity, downed, backoff)
73+
INSERT INTO nodes (service, node, available, current_load, capacity, downed, backoff)
7474
VALUES (
7575
(SELECT id FROM services WHERE service = '{}'),
76-
$1, 1, 0, $2, 0, 0
76+
$1, $2, 0, $2, 0, 0
7777
)
7878
ON CONFLICT (service, node) DO NOTHING
7979
"#,

0 commit comments

Comments
 (0)