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.

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

fix refcount issue when adding/removing VIP group #594

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <pthread.h>
#include <assert.h>
#include <getopt.h>
#include <sys/resource.h>
#include "pidfile.h"
#include "dpdk.h"
#include "conf/common.h"
Expand Down Expand Up @@ -139,6 +140,14 @@ static int parse_app_args(int argc, char **argv)
return ret;
}

static void enable_coredump(void)
{
struct rlimit core_limits;

core_limits.rlim_cur = core_limits.rlim_max = RLIM_INFINITY;
setrlimit(RLIMIT_CORE, &core_limits);
}

int main(int argc, char *argv[])
{
int err, nports;
Expand All @@ -148,6 +157,8 @@ int main(int argc, char *argv[])
char pql_conf_buf[LCORE_CONF_BUFFER_LEN];
int pql_conf_buf_len = LCORE_CONF_BUFFER_LEN;

enable_coredump();

/**
* add application agruments parse before EAL ones.
* use it like the following:
Expand Down
5 changes: 4 additions & 1 deletion tools/keepalived/keepalived/check/ipvswrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,8 @@ ipvs_group_sync_entry(virtual_server_t *vs, virtual_server_group_entry_t *vsge)
}
else
ipvs_group_range_cmd(IP_VS_SO_SET_ADDDEST, &srule, &drule, vsge);

ipvs_set_vsge_alive_state(IP_VS_SO_SET_ADDDEST, vsge, vs);
}
}
}
Expand Down Expand Up @@ -1192,11 +1194,12 @@ ipvs_group_remove_entry(virtual_server_t *vs, virtual_server_group_entry_t *vsge
}
else
ipvs_group_range_cmd(IP_VS_SO_SET_DELDEST, &srule, &drule, vsge);

ipvs_set_vsge_alive_state(IP_VS_SO_SET_DELDEST, vsge, vs);
}
}

/* Remove VS entry if this is the last VS using it */
unset_vsge_alive(vsge, vs);
if (!is_vsge_alive(vsge, vs)) {
if (vsge->range)
ipvs_group_range_cmd(IP_VS_SO_SET_DEL, &srule, NULL, vsge);
Expand Down