Skip to content

Commit c1321c7

Browse files
committed
f Fix for node announcement broadcast after rebase
1 parent 647e8a8 commit c1321c7

File tree

1 file changed

+10
-32
lines changed

1 file changed

+10
-32
lines changed

src/io/utils.rs

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,9 @@ where
204204
Ok(())
205205
}
206206

207-
pub(crate) fn read_latest_node_ann_bcast_timestamp<K: Deref>(
208-
kv_store: K,
209-
) -> Result<u64, std::io::Error>
210-
where
211-
K::Target: KVStore,
212-
{
207+
pub(crate) fn read_latest_node_ann_bcast_timestamp<K: KVStore + Sync + Send>(
208+
kv_store: Arc<K>,
209+
) -> Result<u64, std::io::Error> {
213210
let mut reader = kv_store
214211
.read(LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE, LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY)?;
215212
u64::read(&mut reader).map_err(|_| {
@@ -220,43 +217,24 @@ where
220217
})
221218
}
222219

223-
pub(crate) fn write_latest_node_ann_bcast_timestamp<K: Deref, L: Deref>(
224-
updated_timestamp: u64, kv_store: K, logger: L,
220+
pub(crate) fn write_latest_node_ann_bcast_timestamp<K: KVStore + Sync + Send, L: Deref>(
221+
updated_timestamp: u64, kv_store: Arc<K>, logger: L,
225222
) -> Result<(), Error>
226223
where
227-
K::Target: KVStore,
228224
L::Target: Logger,
229225
{
230-
let mut writer = kv_store
231-
.write(LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE, LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY)
226+
let data = updated_timestamp.encode();
227+
kv_store
228+
.write(LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE, LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY, &data)
232229
.map_err(|e| {
233230
log_error!(
234231
logger,
235-
"Getting writer for key {}/{} failed due to: {}",
232+
"Writing data to key {}/{} failed due to: {}",
236233
LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE,
237234
LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY,
238235
e
239236
);
240237
Error::PersistenceFailed
241238
})?;
242-
updated_timestamp.write(&mut writer).map_err(|e| {
243-
log_error!(
244-
logger,
245-
"Writing data to key {}/{} failed due to: {}",
246-
LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE,
247-
LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY,
248-
e
249-
);
250-
Error::PersistenceFailed
251-
})?;
252-
writer.commit().map_err(|e| {
253-
log_error!(
254-
logger,
255-
"Committing data to key {}/{} failed due to: {}",
256-
LATEST_NODE_ANN_BCAST_TIMSTAMP_NAMESPACE,
257-
LATEST_NODE_ANN_BCAST_TIMSTAMP_KEY,
258-
e
259-
);
260-
Error::PersistenceFailed
261-
})
239+
Ok(())
262240
}

0 commit comments

Comments
 (0)