Skip to content

Commit 0d2c351

Browse files
committed
Remove reportingHost as it is not needed
Every peer receives cluster id mismatch so there is no single reporting host. Signed-off-by: Sasha Bogicevic <[email protected]>
1 parent 766e84f commit 0d2c351

File tree

10 files changed

+7
-19
lines changed

10 files changed

+7
-19
lines changed

docs/docs/known-issues.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Known errors are:
3131
- check configuration with other participants. There should be a corresponding log entry `NetworkClusterIDMismatch` with the information on:
3232
- `clusterPeers` - loaded peers info received from `etcd` cluster.
3333
- `configuredPeers` - peers info coming from `hydra-node` arguments.
34-
- `reportingHost` - host that received the error.
3534

3635
- `member ... has already been bootstrapped` - missing information in `<persistence-dir>/etcd`
3736
- need to bootstrap new cluster or manual workarounds, see also https://etcd.io/docs/v3.5/op-guide/failures/

hydra-cluster/src/Hydra/Cluster/Scenarios.hs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,22 +1182,18 @@ startWithWrongPeers workDir tracer node@RunningNode{nodeSocket} hydraScriptsTxId
11821182

11831183
let hydraTracer = contramap FromHydraNode tracer
11841184
withHydraNode hydraTracer aliceChainConfig workDir 3 aliceSk [bobVk] [3, 4] $ \n1 -> do
1185-
-- NOTE: here we deliberately use the wrong peer list for Bob, which should be visible
1186-
-- in network message sent to Alice.
1185+
-- NOTE: here we deliberately use the wrong peer list for Bob
11871186
withHydraNode hydraTracer bobChainConfig workDir 4 bobSk [aliceVk] [4] $ \_ -> do
11881187
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
11891188

1190-
(clusterPeers, reportingHost, configuredPeers) <- waitMatch 20 n1 $ \v -> do
1189+
(clusterPeers, configuredPeers) <- waitMatch 20 n1 $ \v -> do
11911190
guard $ v ^? key "tag" == Just (Aeson.String "NetworkClusterIDMismatch")
11921191
clusterPeers <- v ^? key "clusterPeers" . _String
1193-
reportingHost <- v ^? key "reportingHost" . _String
11941192
configuredPeers <- v ^? key "misconfiguredPeers" . _String
1195-
pure (clusterPeers, reportingHost, configuredPeers)
1193+
pure (clusterPeers, configuredPeers)
11961194

11971195
when (clusterPeers == configuredPeers) $
11981196
failure "Expected clusterPeers and configuredPeers to be different"
1199-
-- NOTE: reporting host is the host receiving the error, which is Alice
1200-
reportingHost `shouldBe` "http://0.0.0.0:5003"
12011197
clusterPeers `shouldBe` "0.0.0.0:5003=http://0.0.0.0:5003,0.0.0.0:5004=http://0.0.0.0:5004"
12021198
configuredPeers `shouldBe` "0.0.0.0:5004=http://0.0.0.0:5004"
12031199

hydra-node/golden/ServerOutput/NetworkClusterIDMismatch.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"samples": [
33
{
44
"clusterPeers": "",
5-
"misconfiguredPeers": "`",
6-
"reportingHost": "",
5+
"misconfiguredPeers": "",
76
"tag": "NetworkClusterIDMismatch"
87
}
98
],

hydra-node/golden/StateChanged/NetworkClusterIDMismatch.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
"clusterPeers": "",
55
"misconfiguredPeers": "$",
6-
"reportingHost": "",
76
"tag": "NetworkClusterIDMismatch"
87
}
98
],

hydra-node/json-schemas/api.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,8 +1006,6 @@ components:
10061006
enum: ["NetworkClusterIDMismatch"]
10071007
clusterPeers:
10081008
type: string
1009-
reportingHost:
1010-
type: string
10111009
misconfiguredPeers:
10121010
type: string
10131011
seq:

hydra-node/src/Hydra/API/ServerOutput.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ data ServerOutput tx
144144
}
145145
| NetworkClusterIDMismatch
146146
{ clusterPeers :: Text
147-
, reportingHost :: Text
148147
, misconfiguredPeers :: Text
149148
}
150149
| PeerConnected {peer :: Host}

hydra-node/src/Hydra/HeadLogic.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ onConnectionEvent misconfiguredPeers = \case
112112
newState NetworkDisconnected
113113
Network.VersionMismatch{ourVersion, theirVersion} ->
114114
newState NetworkVersionMismatch{ourVersion, theirVersion}
115-
Network.ClusterIDMismatch{clusterPeers, reportingHost} ->
116-
newState NetworkClusterIDMismatch{clusterPeers, reportingHost, misconfiguredPeers}
115+
Network.ClusterIDMismatch{clusterPeers} ->
116+
newState NetworkClusterIDMismatch{clusterPeers, misconfiguredPeers}
117117
Network.PeerConnected{peer} ->
118118
newState PeerConnected{peer}
119119
Network.PeerDisconnected{peer} ->

hydra-node/src/Hydra/HeadLogic/Outcome.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ data StateChanged tx
6262
}
6363
| NetworkClusterIDMismatch
6464
{ clusterPeers :: Text
65-
, reportingHost :: Text
6665
, misconfiguredPeers :: Text
6766
}
6867
| HeadInitialized

hydra-node/src/Hydra/Network.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ data Connectivity
187187
}
188188
| ClusterIDMismatch
189189
{ clusterPeers :: Text
190-
, reportingHost :: Text
191190
}
192191
deriving stock (Generic, Eq, Show)
193192
deriving anyclass (ToJSON)

hydra-node/src/Hydra/Network/Etcd.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ withEtcdNetwork tracer protocolVersion config callback action = do
202202
pure (level', msg')
203203
case expectedClusterMismatch of
204204
Just (Aeson.String "error", Aeson.String "request sent was ignored due to cluster ID mismatch") ->
205-
onConnectivity ClusterIDMismatch{clusterPeers = T.pack clusterPeers, reportingHost = T.pack $ httpUrl advertise}
205+
onConnectivity ClusterIDMismatch{clusterPeers = T.pack clusterPeers}
206206
_ -> traceWith tracer $ EtcdLog{etcd = v}
207207

208208
-- XXX: Could use TLS to secure peer connections

0 commit comments

Comments
 (0)