Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions registry/zookeeper/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use dubbo_base::{
use dubbo_logger::tracing::{debug, error, info};
use serde::{Deserialize, Serialize};
#[allow(unused_imports)]
use zookeeper::{Acl, CreateMode, WatchedEvent, WatchedEventType, Watcher, ZooKeeper};
use zookeeper::{Acl, CreateMode, WatchedEvent, WatchedEventType, Watcher, ZkError, ZooKeeper};

use dubbo::{
registry::{
Expand Down Expand Up @@ -153,7 +153,7 @@ impl ZookeeperRegistry {
match zk_result {
Ok(_) => Ok(()),
Err(err) => {
error!("zk path {} parent not exists.", path);
error!("create path {} to zookeeper error {}", path, err);
Err(Box::try_from(err).unwrap())
}
}
Expand Down Expand Up @@ -184,8 +184,20 @@ impl ZookeeperRegistry {
true => data,
false => "",
};
self.create_path(current.as_str(), new_data, new_create_mode)
.unwrap();

//Skip ZkError::NodeExists
let res = self.create_path(current.as_str(), new_data, new_create_mode);
let mut node_exist = false;
if let Err(e) = &res {
if let Some(zk_err) = e.downcast_ref::<ZkError>() {
if ZkError::NodeExists == *zk_err {
node_exist = true;
}
}
}
if !node_exist {
return res;
}
}
}
Ok(())
Expand Down