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

mod_manager.c: Remove the second assert #155

Merged
merged 2 commits into from
Oct 24, 2023
Merged

mod_manager.c: Remove the second assert #155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21f32af
Remove the last assert(0) from mod_manager.c
jajik Oct 17, 2023
5c7b6a0
Improve node read and removal in mod_manager
jajik Oct 18, 2023
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
39 changes: 24 additions & 15 deletions native/mod_manager/mod_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,23 @@ static char *process_config_node(const char *key, char *val, nodeinfo_t *nodeinf
return NULL;
}

static nodeinfo_t *read_node_by_id(mem_t *mem, int id)
{
nodeinfo_t workernodeinfo;
workernodeinfo.mess.id = id;
return read_node(nodestatsmem, &workernodeinfo);
}

static void mark_node_removed(nodeinfo_t *node)
{
if (node) {
strcpy(node->mess.JVMRoute, "REMOVED");
node->mess.remove = 1;
node->updatetime = apr_time_now();
node->mess.num_remove_check = 0;
}
}

/*
* Process a CONFIG message
* Balancer: <Balancer name>
Expand Down Expand Up @@ -1336,10 +1353,7 @@ static char *process_config(request_rec *r, char **ptr, int *errtype)
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"process_config: node %s %d %s : %s %s already exist removing...", node->mess.JVMRoute,
node->mess.id, node->mess.Port, nodeinfo.mess.JVMRoute, nodeinfo.mess.Port);
strcpy(node->mess.JVMRoute, "REMOVED");
node->mess.remove = 1;
node->updatetime = apr_time_now();
node->mess.num_remove_check = 0;
mark_node_removed(node);
loc_remove_host_context(node->mess.id, r->pool);
inc_version_node();
loc_unlock_nodes();
Expand Down Expand Up @@ -1371,10 +1385,7 @@ static char *process_config(request_rec *r, char **ptr, int *errtype)
nodeinfo.mess.JVMRoute);
if (node == NULL) {
/* try to read the node */
nodeinfo_t workernodeinfo;
nodeinfo_t *workernode;
workernodeinfo.mess.id = id;
workernode = read_node(nodestatsmem, &workernodeinfo);
nodeinfo_t *workernode = read_node_by_id(nodestatsmem, id);
if (workernode != NULL) {
if (strcmp(workernode->mess.JVMRoute, "REMOVED") == 0) {
/* We are in the remove process */
Expand All @@ -1390,7 +1401,7 @@ static char *process_config(request_rec *r, char **ptr, int *errtype)
*errtype = TYPEMEM;
return MNODEET;
}
removed = 1;
removed = id; /* we save the id of the worknode in case insert/update fails */
}
ap_assert(the_conf);
}
Expand Down Expand Up @@ -1442,20 +1453,18 @@ static char *process_config(request_rec *r, char **ptr, int *errtype)
if (insert_update_node(nodestatsmem, &nodeinfo, &id, clean) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"process_config: insert_update_node failed for %s clean: %d", nodeinfo.mess.JVMRoute, clean);
loc_unlock_nodes();
if (removed) {
ap_assert(0); /* troubles */
nodeinfo_t *workernode = read_node_by_id(nodestatsmem, removed);
mark_node_removed(workernode);
}
loc_unlock_nodes();
*errtype = TYPEMEM;
return apr_psprintf(r->pool, MNODEUI, nodeinfo.mess.JVMRoute);
}

if (clean == 0) {
/* need to read the node */
nodeinfo_t workernodeinfo;
nodeinfo_t *workernode;
workernodeinfo.mess.id = id;
workernode = read_node(nodestatsmem, &workernodeinfo);
nodeinfo_t *workernode = read_node_by_id(nodestatsmem, id);
ap_assert(workernode != NULL);
ap_assert(the_conf);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
Expand Down