Skip to content

Commit

Permalink
fix: builtin redeploy and associated aliases bug (#1486)
Browse files Browse the repository at this point in the history 
* fix: builtin redeploy and associated aliases bug
* fix service.info call
  • Loading branch information
@justprosh
justprosh committed Feb 24, 2023
1 parent 95a125f commit 2c11e35
Show file tree
Hide file tree
Showing 2 changed files with 159 additions and 10 deletions.
136 changes: 136 additions & 0 deletions crates/particle-node-tests/tests/builtin.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1758,3 +1758,139 @@ fn exec_script_as_admin(

client.receive_args().wrap_err("receive args")
}

#[test]
fn add_alias_list() {
let swarms = make_swarms(1);
let mut client = ConnectedClient::connect_with_keypair(
swarms[0].multiaddr.clone(),
Some(swarms[0].management_keypair.clone()),
)
.wrap_err("connect client")
.unwrap();

let tetraplets_service = create_service(
&mut client,
"tetraplets",
load_module("tests/tetraplets/artifacts", "tetraplets").expect("load module"),
);

let alias = "tetraplets".to_string();
client.send_particle(
r#"
(seq
(seq
(call relay ("srv" "add_alias") [alias service])
(call relay ("srv" "list") [] list)
)
(call %init_peer_id% ("op" "return") [list])
)
"#,
hashmap! {
"relay" => json!(client.node.to_string()),
"service" => json!(tetraplets_service.id),
"alias" => json!(alias.clone())
},
);

use serde_json::Value::Array;

if let [Array(list)] = client.receive_args().unwrap().as_slice() {
assert_eq!(list.len(), 1);

let service_info = &list[0];
let aliases = service_info
.as_object()
.unwrap()
.get("aliases")
.unwrap()
.as_array()
.unwrap();
assert_eq!(aliases.len(), 1);
assert_eq!(aliases[0].as_str().unwrap(), alias)
} else {
panic!("incorrect args: expected an array")
}
}

#[test]
fn aliases_restart() {
let kp = KeyPair::generate_ed25519();
let swarms = make_swarms_with_keypair(1, kp.clone(), None);

let mut client = ConnectedClient::connect_with_keypair(
swarms[0].multiaddr.clone(),
Some(swarms[0].management_keypair.clone()),
)
.wrap_err("connect client")
.unwrap();

let tetraplets_service = create_service(
&mut client,
"tetraplets",
load_module("tests/tetraplets/artifacts", "tetraplets").expect("load module"),
);

let alias = "tetraplets".to_string();
client.send_particle(
r#"
(xor
(seq
(call relay ("srv" "add_alias") [alias service])
(call %init_peer_id% ("op" "return") ["ok"])
)
(call %init_peer_id% ("op" "return") [%last_error%.$.instruction])
)
"#,
hashmap! {
"relay" => json!(client.node.to_string()),
"service" => json!(tetraplets_service.id),
"alias" => json!(alias.clone())
},
);

if let [JValue::String(result)] = client.receive_args().unwrap().as_slice() {
assert_eq!(*result, "ok");
}

use serde_json::Value::Array;

// stop swarm
swarms.into_iter().map(|s| s.outlet.send(())).for_each(drop);
let swarms = make_swarms_with_keypair(1, kp, None);
let mut client = ConnectedClient::connect_with_keypair(
swarms[0].multiaddr.clone(),
Some(swarms[0].management_keypair.clone()),
)
.wrap_err("connect client")
.unwrap();

client.send_particle(
r#"
(seq
(call relay ("srv" "list") [] list_after)
(call %init_peer_id% ("op" "return") [list_after])
)
"#,
hashmap! {
"relay" => json!(client.node.to_string()),
"service" => json!(tetraplets_service.id),
},
);

if let [Array(after)] = client.receive_args().unwrap().as_slice() {
assert_eq!(after.len(), 1);
let service_info = &after[0];
let aliases = service_info
.as_object()
.unwrap()
.get("aliases")
.unwrap()
.as_array()
.unwrap();
assert_eq!(aliases.len(), 1);
assert_eq!(aliases[0].as_str().unwrap(), alias)
} else {
panic!("incorrect args: expected array")
}
}
33 changes: 23 additions & 10 deletions particle-services/src/app_services.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ impl ParticleAppServices {
"id": service_id,
"blueprint_id": service.blueprint_id,
"owner_id": service.owner_id.to_string(),
// TODO: add service.root_aliases ???
"aliases": service.worker_aliases,
"worker_aliases": service.worker_aliases,
"aliases": service.root_aliases,
"worker_id": service.worker_id.to_string()
}))
}
Expand Down Expand Up @@ -636,7 +636,8 @@ impl ParticleAppServices {
"id": id,
"blueprint_id": srv.blueprint_id,
"owner_id": srv.owner_id.to_string(),
"aliases": srv.worker_aliases,
"worker_aliases": srv.worker_aliases,
"aliases": srv.root_aliases,
"worker_id": srv.worker_id.to_string()
})
})
Expand Down Expand Up @@ -710,7 +711,7 @@ impl ParticleAppServices {
};

// worker_aliases
{
if worker_id != self.config.local_peer_id {
let mut binding = self.aliases.write();
let aliases = binding.entry(worker_id).or_default();
for alias in s.aliases.into_iter() {
Expand All @@ -730,7 +731,7 @@ impl ParticleAppServices {
{
let mut binding = self.aliases.write();
let aliases = binding.entry(self.config.local_peer_id).or_default();
for alias in s.root_aliases.into_iter() {
for alias in s.root_aliases.iter() {
let old = aliases.insert(alias.clone(), s.service_id.clone());
if let Some(old) = old {
log::warn!(
Expand All @@ -748,9 +749,10 @@ impl ParticleAppServices {
);

log::info!(
"Persisted service {} created in {}",
"Persisted service {} created in {}, aliases: {:?}",
s.service_id,
pretty(start.elapsed())
pretty(start.elapsed()),
s.root_aliases
);
}
}
Expand All @@ -771,7 +773,7 @@ impl ParticleAppServices {
blueprint_id.clone(),
service_id.clone(),
worker_aliases.clone(),
root_aliases,
root_aliases.clone(),
owner_id,
worker_id,
self.metrics.as_ref(),
Expand All @@ -785,14 +787,14 @@ impl ParticleAppServices {
})?;
let stats = service.module_memory_stats();
let stats = ServiceMemoryStat::new(&stats);
let service_type = ServiceType::Service(worker_aliases.first().cloned());
let service_type = ServiceType::Service(root_aliases.first().cloned());
let service = Service {
service: Mutex::new(service),
blueprint_id,
owner_id,
worker_aliases,
worker_id,
root_aliases: vec![],
root_aliases,
};

let replaced = self.services.write().insert(service_id.clone(), service);
Expand Down Expand Up @@ -1116,11 +1118,21 @@ mod tests {
let pas = create_pas(local_pid, management_pid, base_dir.into_path());

let module_name = "tetra".to_string();
let alias = "alias".to_string();
let hash = upload_tetra_service(&pas, module_name.clone());

let service_id1 = create_service(&pas, module_name, &hash, local_pid).unwrap();
pas.add_alias(
alias.clone(),
local_pid,
service_id1.clone(),
management_pid,
)
.unwrap();
let services = pas.services.read();
let service_1 = services.get(&service_id1).unwrap();
assert_eq!(service_1.root_aliases.len(), 1);
assert_eq!(service_1.root_aliases[0], alias);

let persisted_services: Vec<_> =
load_persisted_services(&pas.config.services_dir, local_pid)
Expand All @@ -1129,6 +1141,7 @@ mod tests {
.unwrap();
let persisted_service_1 = persisted_services.first().unwrap();
assert_eq!(service_1.worker_aliases, persisted_service_1.aliases);
assert_eq!(service_1.root_aliases, persisted_service_1.root_aliases);
assert_eq!(service_1.blueprint_id, persisted_service_1.blueprint_id);
assert_eq!(service_id1, persisted_service_1.service_id);
assert_eq!(service_1.owner_id, persisted_service_1.owner_id);
Expand Down

0 comments on commit 2c11e35

Please sign in to comment.