From d355e07e2de580c4627baf51d5c4e9c733331f52 Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Mon, 18 Aug 2014 09:39:29 +0000 Subject: [PATCH 1/5] gitignore cleanup * ignore typical backup files created by common editors * move general ignore rules like "*.o" or "depend.mk" to top level gitignore * ignore executables and test directories in target dir gitignore as these are local and there's no general catch-all pattern for them --- .gitignore | 36 ++++++++++++++++--- client/.gitignore | 2 ++ log_manager/.gitignore | 5 --- log_manager/test/.gitignore | 2 ++ query_classifier/.gitignore | 5 --- query_classifier/test/.gitignore | 2 ++ server/core/.gitignore | 5 +-- server/core/test/.gitignore | 2 ++ server/modules/monitor/.gitignore | 3 -- server/modules/protocol/.gitignore | 3 -- server/modules/routing/.gitignore | 3 -- .../modules/routing/readwritesplit/.gitignore | 3 -- server/test/.gitignore | 7 ++++ utils/.gitignore | 1 - 14 files changed, 50 insertions(+), 29 deletions(-) create mode 100644 client/.gitignore delete mode 100644 log_manager/.gitignore create mode 100644 log_manager/test/.gitignore delete mode 100644 query_classifier/.gitignore create mode 100644 query_classifier/test/.gitignore create mode 100644 server/core/test/.gitignore delete mode 100644 server/modules/monitor/.gitignore delete mode 100644 server/modules/protocol/.gitignore delete mode 100644 server/modules/routing/.gitignore delete mode 100644 server/modules/routing/readwritesplit/.gitignore create mode 100644 server/test/.gitignore delete mode 100644 utils/.gitignore diff --git a/.gitignore b/.gitignore index b680e25df..64e460020 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,32 @@ -server/core/tags -server/core/maxscale -server/core/maxkeys -server/core/maxpasswd +# Object files +*.o +*.ko +*.lo + +# Libraries +*.lib +*.a +*.la + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app + +# log files (from testing etc.) +*.log + +# "make depend" generated stuff +depend +depend.mk + +# various auto-backup stuff +*~ +*# +.#* diff --git a/client/.gitignore b/client/.gitignore new file mode 100644 index 000000000..0e7ae0f51 --- /dev/null +++ b/client/.gitignore @@ -0,0 +1,2 @@ +# binaries generated here +maxadmin diff --git a/log_manager/.gitignore b/log_manager/.gitignore deleted file mode 100644 index d5a8be98b..000000000 --- a/log_manager/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.o -*.so -*.so.* -depend.mk - diff --git a/log_manager/test/.gitignore b/log_manager/test/.gitignore new file mode 100644 index 000000000..c6172ea0a --- /dev/null +++ b/log_manager/test/.gitignore @@ -0,0 +1,2 @@ +# binaries generated here +testlog diff --git a/query_classifier/.gitignore b/query_classifier/.gitignore deleted file mode 100644 index d5a8be98b..000000000 --- a/query_classifier/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.o -*.so -*.so.* -depend.mk - diff --git a/query_classifier/test/.gitignore b/query_classifier/test/.gitignore new file mode 100644 index 000000000..670ee3e79 --- /dev/null +++ b/query_classifier/test/.gitignore @@ -0,0 +1,2 @@ +# binaries generated here +testmain diff --git a/server/core/.gitignore b/server/core/.gitignore index 84590451f..e9b574d3e 100644 --- a/server/core/.gitignore +++ b/server/core/.gitignore @@ -1,3 +1,4 @@ -*.o +# binaries generated here maxscale -depend.mk +maxkeys +maxpasswd diff --git a/server/core/test/.gitignore b/server/core/test/.gitignore new file mode 100644 index 000000000..ebadda641 --- /dev/null +++ b/server/core/test/.gitignore @@ -0,0 +1,2 @@ +#binaries generated here +testhash diff --git a/server/modules/monitor/.gitignore b/server/modules/monitor/.gitignore deleted file mode 100644 index 1f1cd4c04..000000000 --- a/server/modules/monitor/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.o -*.so -depend.mk diff --git a/server/modules/protocol/.gitignore b/server/modules/protocol/.gitignore deleted file mode 100644 index 1f1cd4c04..000000000 --- a/server/modules/protocol/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.o -*.so -depend.mk diff --git a/server/modules/routing/.gitignore b/server/modules/routing/.gitignore deleted file mode 100644 index 1f1cd4c04..000000000 --- a/server/modules/routing/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.o -*.so -depend.mk diff --git a/server/modules/routing/readwritesplit/.gitignore b/server/modules/routing/readwritesplit/.gitignore deleted file mode 100644 index 1f1cd4c04..000000000 --- a/server/modules/routing/readwritesplit/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.o -*.so -depend.mk diff --git a/server/test/.gitignore b/server/test/.gitignore new file mode 100644 index 000000000..b8ca24c40 --- /dev/null +++ b/server/test/.gitignore @@ -0,0 +1,7 @@ +bin/ +Documentation/ +etc/ +lib/ +log/ +modules/ +mysql/ diff --git a/utils/.gitignore b/utils/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/utils/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o From 13b79d4124ac46d75b9d90c2d81ad8e622e38a88 Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Mon, 18 Aug 2014 09:43:38 +0000 Subject: [PATCH 2/5] comment header --- server/test/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/server/test/.gitignore b/server/test/.gitignore index b8ca24c40..184d7f57f 100644 --- a/server/test/.gitignore +++ b/server/test/.gitignore @@ -1,3 +1,4 @@ +# directories generated/filled by "make testall" bin/ Documentation/ etc/ From 7225804c421ec5f53284b9de6682ab2d28e99cee Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Mon, 15 Sep 2014 13:23:58 +0100 Subject: [PATCH 3/5] Add vi swap files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 64e460020..6e659cc6b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ depend.mk *~ *# .#* + +# Vi swap files +.*.swp From d5e2410fe6768be65292413ced9a771cec397a6f Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Mon, 15 Sep 2014 14:53:08 +0100 Subject: [PATCH 4/5] Fix for zero wieght in readconnrouter --- server/modules/routing/readconnroute.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c index a5c648c67..68e2dfcef 100644 --- a/server/modules/routing/readconnroute.c +++ b/server/modules/routing/readconnroute.c @@ -264,11 +264,11 @@ char *weightby; { for (n = 0; inst->servers[n]; n++) { - int perc; + int perc, wght; backend = inst->servers[n]; - perc = (atoi(serverGetParameter(backend->server, - weightby)) * 1000) / total; - if (perc == 0) + perc = ((wght = atoi(serverGetParameter(backend->server, + weightby))) * 1000) / total; + if (perc == 0 && wght != 0) perc = 1; backend->weight = perc; if (perc == 0) @@ -279,7 +279,7 @@ char *weightby; "for weighting parameter '%s', " "no queries will be routed to " "this server.\n", - server->unique_name, + inst->servers[n]->server->unique_name, weightby))); } @@ -418,6 +418,9 @@ BACKEND *master_host = NULL; if (SERVER_IN_MAINT(inst->servers[i]->server)) continue; + if (inst->servers[i]->weight == 0) + continue; + /* Check server status bits against bitvalue from router_options */ if (inst->servers[i] && SERVER_IS_RUNNING(inst->servers[i]->server) && From 4e88833d3ec8f34e9f2918891e8faa4a365fb495 Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Mon, 15 Sep 2014 15:53:09 +0200 Subject: [PATCH 5/5] Fixed memory leak in getUsers bug 439 Fixed memory leak in getUsers bug 439 --- server/core/dbusers.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/core/dbusers.c b/server/core/dbusers.c index d318fd5f2..4f8de392b 100644 --- a/server/core/dbusers.c +++ b/server/core/dbusers.c @@ -359,10 +359,10 @@ getUsers(SERVICE *service, struct users *users) row[0], row[1], rc == NULL ? "NULL" : ret_ip))); - - continue; } + free(key.user); + } else { /* setipaddress() failed, skip user add and log this*/ LOGIF(LE, (skygw_log_write_flush( @@ -380,7 +380,6 @@ getUsers(SERVICE *service, struct users *users) memcpy(users->cksum, hash, SHA_DIGEST_LENGTH); free(users_data); - free(key.user); mysql_free_result(result); mysql_close(con);