hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notification server integration

Browse Source 
Notification server integration: added proper logging to errors

Added “enable/disable feedback” via maxadmin/telnet
This commit is contained in:
MassimilianoPinto
2015-03-05 18:58:07 +01:00
parent 698af9d3b7
commit e952db0ee9
3 changed files with 156 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/core/config.c
View File

@ -2158,8 +2158,37 @@ config_get_release_string(char* release)
void void
config_enable_feedback_task(void) { config_enable_feedback_task(void) {
FEEDBACK_CONF *cfg = config_get_feedback_data(); FEEDBACK_CONF *cfg = config_get_feedback_data();
if (cfg->feedback_enable) int url_set = 0;
hktask_add("send_feedback", module_feedback_send, cfg, 30); int user_info_set = 0;
int enable_set = cfg->feedback_enable;
url_set = cfg->feedback_url != NULL && strlen(cfg->feedback_url);
user_info_set = cfg->feedback_user_info != NULL && strlen(cfg->feedback_user_info);
if (enable_set && url_set && user_info_set) {
/* Add the task to the tasl list */
if (hktask_add("send_feedback", module_feedback_send, cfg, 30)) {
LOGIF(LM, (skygw_log_write_flush(
LOGFILE_MESSAGE,
"Notification service feedback task started: URL=%s, User-Info=%s, Frequency %u seconds",
cfg->feedback_url,
cfg->feedback_user_info,
30)));
}
} else {
if (enable_set) {
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error: Notification service feedback cannot start: feedback_enable=1 but"
" some required parameters are not set: %s%s%s",
url_set == 0 ? "feedback_url is not set" : "", (user_info_set == 0 && url_set == 0) ? ", " : "", user_info_set == 0 ? "feedback_user_info is not set" : "")));
} else {
LOGIF(LT, (skygw_log_write_flush(
LOGFILE_TRACE,
"Notification service feedback is not enabled")));
}
}
} }
/** /**

90
server/core/load_utils.c
View File

@ -70,6 +70,16 @@ struct MemoryStruct {
size_t size; size_t size;
}; };
/**
* Callback write routine for curl library, getting remote server reply
*
* @param contents New data to add
* @param size Data size
* @param nmemb Elements in the buffer
* @param userp Pointer to the buffer
* @return 0 on failure, memory size on success
*
*/
static size_t static size_t
WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp) WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp)
{ {
@ -79,7 +89,9 @@ WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp)
mem->data = realloc(mem->data, mem->size + realsize + 1); mem->data = realloc(mem->data, mem->size + realsize + 1);
if(mem->data == NULL) { if(mem->data == NULL) {
/* out of memory! */ /* out of memory! */
printf("not enough memory (realloc returned NULL)\n"); LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error in module_feedback_send(), not enough memory for realloc")));
return 0; return 0;
} }
@ -525,7 +537,7 @@ int *data;
void void
module_feedback_send(void* data) { module_feedback_send(void* data) {
MODULES *ptr = registered; MODULES *ptr = registered;
CURL *curl; CURL *curl = NULL;
CURLcode res; CURLcode res;
struct curl_httppost *formpost=NULL; struct curl_httppost *formpost=NULL;
struct curl_httppost *lastptr=NULL; struct curl_httppost *lastptr=NULL;
@ -533,7 +545,7 @@ module_feedback_send(void* data) {
void *data_ptr=NULL; void *data_ptr=NULL;
long http_code = 0; long http_code = 0;
struct MemoryStruct chunk; struct MemoryStruct chunk;
int last_action = 0; int last_action = _NOTIFICATION_SEND_PENDING;
time_t now; time_t now;
struct tm *now_tm; struct tm *now_tm;
int hour; int hour;
@ -548,10 +560,17 @@ module_feedback_send(void* data) {
/* Configuration check */ /* Configuration check */
if (feedback_config->feedback_url == NULL || feedback_config->feedback_user_info == NULL) { if (feedback_config->feedback_enable == 0 || feedback_config->feedback_url == NULL || feedback_config->feedback_user_info == NULL) {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"module_feedback_create : skip task because feedback_url or feedback_user_info is NULL"))); "Error in module_feedback_send(): some mandatory parameters are not set"
" feedback_enable=%u, feedback_url=%s, feedback_user_info=%s",
feedback_config->feedback_enable,
feedback_config->feedback_url == NULL ? "NULL" : feedback_config->feedback_url,
feedback_config->feedback_user_info == NULL ? "NULL" : feedback_config->feedback_user_info)));
feedback_config->feedback_last_action = _NOTIFICATION_SEND_ERROR;
return; return;
} }
@ -565,9 +584,10 @@ module_feedback_send(void* data) {
/* It's not the rigt time, mark it as to be done and return */ /* It's not the rigt time, mark it as to be done and return */
feedback_config->feedback_last_action = _NOTIFICATION_SEND_PENDING; feedback_config->feedback_last_action = _NOTIFICATION_SEND_PENDING;
LOGIF(LE, (skygw_log_write_flush( LOGIF(LT, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_TRACE,
"module_feedback_create : skip task because of time interval: hour is [%d]", "module_feedback_send(): execution skipped, current hour [%d]"
" is not within the proper interval (from 2 AM to 4 AM)",
hour))); hour)));
return; return;
@ -577,17 +597,17 @@ module_feedback_send(void* data) {
if (feedback_config->feedback_last_action == _NOTIFICATION_SEND_OK) { if (feedback_config->feedback_last_action == _NOTIFICATION_SEND_OK) {
/* task was done before, return */ /* task was done before, return */
LOGIF(LE, (skygw_log_write_flush( LOGIF(LT, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_TRACE,
"module_feedback_create : skip task because of previous succesful run: hour is [%d], last_action [%d]", "module_feedback_send() : execution skipped because of previous succesful run: hour is [%d], last_action [%d]",
hour, feedback_config->feedback_last_action))); hour, feedback_config->feedback_last_action)));
return; return;
} }
LOGIF(LE, (skygw_log_write_flush( LOGIF(LT, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_TRACE,
"module_feedback_create : task runs: hour is [%d], last_action [%d]", "module_feedback_send(): task now runs: hour is [%d], last_action [%d]",
hour, feedback_config->feedback_last_action))); hour, feedback_config->feedback_last_action)));
@ -608,6 +628,17 @@ module_feedback_send(void* data) {
ptr = registered; ptr = registered;
buffer = gwbuf_alloc(n_mod * 256); buffer = gwbuf_alloc(n_mod * 256);
if (buffer == NULL) {
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error in module_feedback_send(): gwbuf_alloc() failed to allocate %d bytes",
n_mod * 256)));
feedback_config->feedback_last_action = _NOTIFICATION_SEND_ERROR;
return;
}
data_ptr = GWBUF_DATA(buffer); data_ptr = GWBUF_DATA(buffer);
sprintf(data_ptr, "FEEDBACK_SERVER_UID\t%s\n", hex_setup_info); sprintf(data_ptr, "FEEDBACK_SERVER_UID\t%s\n", hex_setup_info);
@ -711,26 +742,38 @@ module_feedback_send(void* data) {
if(res != CURLE_OK) { if(res != CURLE_OK) {
last_action = _NOTIFICATION_SEND_ERROR; last_action = _NOTIFICATION_SEND_ERROR;
fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res)); LOGIF(LE, (skygw_log_write_flush(
fprintf(stderr, "curl error_message: [%s]\n", error_message); LOGFILE_ERROR,
"Error: module_feedback_send(), curl call for [%s] failed due: %s, %s",
feedback_config->feedback_url,
curl_easy_strerror(res),
error_message)));
} else { } else {
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code); curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
fprintf(stderr, "Reply from remote server is\n[%s]. Code [%lu]\n", chunk.data, http_code);
} }
if (http_code == 200) { if (http_code == 200) {
last_action = _NOTIFICATION_SEND_OK; last_action = _NOTIFICATION_SEND_OK;
} else {
last_action = _NOTIFICATION_SEND_ERROR;
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error in module_feedback_send(), Bad HTTP Code from remote server: %lu",
http_code)));
} }
} else { } else {
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error in module_feedback_send(), curl object not initialized")));
last_action = _NOTIFICATION_SEND_ERROR; last_action = _NOTIFICATION_SEND_ERROR;
} }
memcpy(&feedback_config->feedback_last_action, &last_action, sizeof(int)); /* update last action in the config struct */
feedback_config->feedback_last_action = last_action;
LOGIF(LE, (skygw_log_write_flush( LOGIF(LT, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_TRACE,
"module_feedback_create : task run result: hour is [%d], last_action [%d], http_code [%d]", "module_feedback_send(): task run result: hour is [%d], last_action [%d], HTTP code [%d]",
hour, feedback_config->feedback_last_action, http_code))); hour, feedback_config->feedback_last_action, http_code)));
if(chunk.data) if(chunk.data)
@ -738,8 +781,11 @@ module_feedback_send(void* data) {
gwbuf_free(buffer); gwbuf_free(buffer);
if (curl) {
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_formfree(formpost); curl_formfree(formpost);
}
curl_global_cleanup(); curl_global_cleanup();
} }

44
server/modules/routing/debugcmd.c
View File

@ -36,12 +36,13 @@
* Date Who Description * Date Who Description
* 20/06/13 Mark Riddoch Initial implementation * 20/06/13 Mark Riddoch Initial implementation
* 17/07/13 Mark Riddoch Additional commands * 17/07/13 Mark Riddoch Additional commands
* 09/08/2013 Massimiliano Pinto Added enable/disable commands (now only for log) * 09/08/13 Massimiliano Pinto Added enable/disable commands (now only for log)
* 20/05/14 Mark Riddoch Added ability to give server and service names rather * 20/05/14 Mark Riddoch Added ability to give server and service names rather
* than simply addresses * than simply addresses
* 23/05/14 Mark Riddoch Added support for developer and user modes * 23/05/14 Mark Riddoch Added support for developer and user modes
* 29/05/14 Mark Riddoch Add Filter support * 29/05/14 Mark Riddoch Add Filter support
* 16/10/14 Mark Riddoch Add show eventq * 16/10/14 Mark Riddoch Add show eventq
* 05/03/15 Massimiliano Pinto Added enable/disable feedback
* *
* @endverbatim * @endverbatim
*/ */
@ -365,6 +366,8 @@ static void enable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor);
static void disable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor); static void disable_monitor_replication_heartbeat(DCB *dcb, MONITOR *monitor);
static void enable_service_root(DCB *dcb, SERVICE *service); static void enable_service_root(DCB *dcb, SERVICE *service);
static void disable_service_root(DCB *dcb, SERVICE *service); static void disable_service_root(DCB *dcb, SERVICE *service);
static void enable_feedback_action();
static void disable_feedback_action();
/** /**
* * The subcommands of the enable command * * The subcommands of the enable command
@ -406,6 +409,14 @@ struct subcommand enableoptions[] = {
"Enable root access to a service, pass a service name to enable root access", "Enable root access to a service, pass a service name to enable root access",
{ARG_TYPE_SERVICE, 0, 0} {ARG_TYPE_SERVICE, 0, 0}
}, },
{
"feedback",
0,
enable_feedback_action,
"Enable MaxScale modules list sending via http to notification service",
"Enable MaxScale modules list sending via http to notification service",
{0, 0, 0}
},
{ {
NULL, NULL,
0, 0,
@ -458,6 +469,14 @@ struct subcommand disableoptions[] = {
"Disable root access to a service", "Disable root access to a service",
{ARG_TYPE_SERVICE, 0, 0} {ARG_TYPE_SERVICE, 0, 0}
}, },
{
"feedback",
0,
disable_feedback_action,
"Disable MaxScale modules list sending via http to notification service",
"Disable MaxScale modules list sending via http to notification service",
{0, 0, 0}
},
{ {
NULL, NULL,
0, 0,
@ -1381,6 +1400,29 @@ set_nbpoll(DCB *dcb, int nb)
poll_set_nonblocking_polls(nb); poll_set_nonblocking_polls(nb);
} }
/**
* Re-enable sendig MaxScale module list via http
* Proper [feedback] section in MaxSclale.cnf
* is required.
*/
static void
enable_feedback_action(void)
{
config_enable_feedback_task();
return;
}
/**
* Disable sendig MaxScale module list via http
*/
static void
disable_feedback_action(void)
{
config_disable_feedback_task();
return;
}
#if defined(FAKE_CODE) #if defined(FAKE_CODE)
static void fail_backendfd(void) static void fail_backendfd(void)
{ {