From 2b146b103ad50e7d6d84521189ed27e87b518836 Mon Sep 17 00:00:00 2001 From: Bogdan Rosianu Date: Wed, 25 Oct 2023 14:15:55 +0300 Subject: [PATCH 1/3] fix nodes cleanup after reloading --- cmd/proxy/config/config.toml | 14 +++----------- observer/baseNodeProvider.go | 1 + 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/cmd/proxy/config/config.toml b/cmd/proxy/config/config.toml index d61623a5..13ea7789 100644 --- a/cmd/proxy/config/config.toml +++ b/cmd/proxy/config/config.toml @@ -74,14 +74,6 @@ Address = "http://127.0.0.1:8082" [[Observers]] - ShardId = 1 - Address = "http://127.0.0.1:8083" - IsFallback = true - -[[FullHistoryNodes]] - ShardId = 0 - Address = "http://127.0.0.1:8081" - -[[FullHistoryNodes]] - ShardId = 1 - Address = "http://127.0.0.1:8082" + ShardId = 4294967295 + Address = "http://127.0.0.1:8083 + IsFallback = false diff --git a/observer/baseNodeProvider.go b/observer/baseNodeProvider.go index 07f475df..e5c0724c 100644 --- a/observer/baseNodeProvider.go +++ b/observer/baseNodeProvider.go @@ -405,6 +405,7 @@ func (bnp *baseNodeProvider) ReloadNodes(nodesType data.NodeType) data.NodesRelo bnp.mutNodes.Lock() bnp.shardIds = getSortedShardIDsSlice(newNodes) bnp.syncedNodes, bnp.syncedFallbackNodes = initAllNodesSlice(newNodes) + bnp.outOfSyncNodes, bnp.outOfSyncFallbackNodes = make([]*data.NodeData, 0), make([]*data.NodeData, 0) bnp.lastSyncedNodes = make(map[uint32]*data.NodeData) bnp.mutNodes.Unlock() From 9ebcd5e1c2460e9a284980b531f2ea56e1aecb86 Mon Sep 17 00:00:00 2001 From: Bogdan Rosianu Date: Thu, 26 Oct 2023 11:25:23 +0300 Subject: [PATCH 2/3] update config toml default values --- cmd/proxy/config/config.toml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/cmd/proxy/config/config.toml b/cmd/proxy/config/config.toml index 1ff36457..9cf47be2 100644 --- a/cmd/proxy/config/config.toml +++ b/cmd/proxy/config/config.toml @@ -69,21 +69,14 @@ [[Observers]] ShardId = 0 Address = "http://127.0.0.1:8081" - IsSnapshotless = true + IsSnapshotless = false [[Observers]] ShardId = 1 Address = "http://127.0.0.1:8082" [[Observers]] - ShardId = 1 + ShardId = 4294967295 Address = "http://127.0.0.1:8083" - IsFallback = true - -[[FullHistoryNodes]] - ShardId = 0 - Address = "http://127.0.0.1:8081" + IsFallback = false -[[FullHistoryNodes]] - ShardId = 1 - Address = "http://127.0.0.1:8082" From 07c63eaaa38f0ccda6779d0775742f859f2f4008 Mon Sep 17 00:00:00 2001 From: Bogdan Rosianu Date: Thu, 26 Oct 2023 11:29:32 +0300 Subject: [PATCH 3/3] fixes after merge --- cmd/proxy/config/config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/proxy/config/config.toml b/cmd/proxy/config/config.toml index 4433d04d..9cf47be2 100644 --- a/cmd/proxy/config/config.toml +++ b/cmd/proxy/config/config.toml @@ -69,6 +69,7 @@ [[Observers]] ShardId = 0 Address = "http://127.0.0.1:8081" + IsSnapshotless = false [[Observers]] ShardId = 1