Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Agent] optimize match expression #4339

Merged
merged 4 commits into from Sep 21, 2023
Merged

[Agent] optimize match expression #4339

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46df9e2
[Agent] optimize match expression
xiaoziv Sep 20, 2023
8fa1b4e
Merge branch 'main' into refactor-match-code
xiaoziv Sep 20, 2023
0f7ec8d
Update trident.rs
xiaoziv Sep 20, 2023
3ac90e9
Merge branch 'main' into refactor-match-code
sharang Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
104 changes: 51 additions & 53 deletions agent/src/trident.rs
View file
Open in desktop
Expand Up @@ -767,67 +767,65 @@ impl Trident {

components.replace(comp);
}
Some(components) => match components {
Components::Agent(components) => {
let callbacks: Vec<fn(&ConfigHandler, &mut AgentComponents)> =
config_handler.on_config(
runtime_config,
&exception_handler,
Some(components),
#[cfg(target_os = "linux")]
&api_watcher,
);

#[cfg(target_os = "linux")]
if config_handler
.candidate_config
.platform
.kubernetes_api_enabled
{
api_watcher.start();
} else {
api_watcher.stop();
}

components.start();
components.config = config_handler.candidate_config.clone();
dispatcher_listener_callback(
&config_handler.candidate_config.dispatcher,
components,
blacklist,
vm_mac_addrs,
gateway_vmac_addrs,
tap_types,
);
for callback in callbacks {
callback(&config_handler, components);
}

for listener in components.dispatcher_listeners.iter_mut() {
listener.on_config_change(&config_handler.candidate_config.dispatcher);
}
}
_ => {
config_handler.on_config(
Some(Components::Agent(components)) => {
let callbacks: Vec<fn(&ConfigHandler, &mut AgentComponents)> = config_handler
.on_config(
runtime_config,
&exception_handler,
None,
Some(components),
#[cfg(target_os = "linux")]
&api_watcher,
);

#[cfg(target_os = "linux")]
if config_handler
.candidate_config
.platform
.kubernetes_api_enabled
{
api_watcher.start();
} else {
api_watcher.stop();
}

components.start();
components.config = config_handler.candidate_config.clone();
dispatcher_listener_callback(
&config_handler.candidate_config.dispatcher,
components,
blacklist,
vm_mac_addrs,
gateway_vmac_addrs,
tap_types,
);
for callback in callbacks {
callback(&config_handler, components);
}

for listener in components.dispatcher_listeners.iter_mut() {
listener.on_config_change(&config_handler.candidate_config.dispatcher);
}
}
_ => {
config_handler.on_config(
runtime_config,
&exception_handler,
None,
#[cfg(target_os = "linux")]
if config_handler
.candidate_config
.platform
.kubernetes_api_enabled
{
api_watcher.start();
} else {
api_watcher.stop();
}
&api_watcher,
);

#[cfg(target_os = "linux")]
if config_handler
.candidate_config
.platform
.kubernetes_api_enabled
{
api_watcher.start();
} else {
api_watcher.stop();
}
},
}
}
state_guard = state.lock().unwrap();
}
Expand Down