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

MXS-1220: Implement JSON diagnostics entry point all filters

Browse Source 
The second and final part of the filters now implement the JSON version of
the diagnostics function.
This commit is contained in:
Markus Mäkelä
2017-04-18 08:05:29 +03:00
committed by Markus Mäkelä
parent 12baa304e6
commit 25c8fb8556
10 changed files with 131 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/modules/filter/insertstream/insertstream.c
View File

@ -37,7 +37,7 @@ static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream); static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *session, MXS_UPSTREAM *upstream); static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *session, MXS_UPSTREAM *upstream);
static int32_t routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int32_t routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb); static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession);
static uint64_t getCapabilities(MXS_FILTER *instance); static uint64_t getCapabilities(MXS_FILTER *instance);
static int32_t clientReply(MXS_FILTER* instance, MXS_FILTER_SESSION *session, GWBUF *reply); static int32_t clientReply(MXS_FILTER* instance, MXS_FILTER_SESSION *session, GWBUF *reply);
static bool extract_insert_target(GWBUF *buffer, char* target, int len); static bool extract_insert_target(GWBUF *buffer, char* target, int len);
@ -497,20 +497,24 @@ static int32_t clientReply(MXS_FILTER* instance, MXS_FILTER_SESSION *session, GW
* *
* @param instance The filter instance * @param instance The filter instance
* @param fsession Filter session, may be NULL * @param fsession Filter session, may be NULL
* @param dcb The DCB for diagnostic output
*/ */
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb) static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession)
{ {
DS_INSTANCE *my_instance = (DS_INSTANCE *) instance; DS_INSTANCE *my_instance = (DS_INSTANCE*)instance;
json_t* rval = json_object();
if (my_instance->source) if (my_instance->source)
{ {
dcb_printf(dcb, "\t\tReplacement limited to connections from %s\n", my_instance->source); json_object_set_new(rval, "source", json_string(my_instance->source));
} }
if (my_instance->user) if (my_instance->user)
{ {
dcb_printf(dcb, "\t\tReplacement limit to user %s\n", my_instance->user); json_object_set_new(rval, "user", json_string(my_instance->user));
} }
return rval;
} }
/** /**

4
server/modules/filter/masking/maskingfilter.cc
View File

@ -138,9 +138,9 @@ MaskingFilterSession* MaskingFilter::newSession(MXS_SESSION* pSession)
} }
// static // static
void MaskingFilter::diagnostics(DCB* pDcb) json_t* MaskingFilter::diagnostics()
{ {
dcb_printf(pDcb, "Hello, World!\n"); return NULL;
} }
// static // static

2
server/modules/filter/masking/maskingfilter.hh
View File

@ -33,7 +33,7 @@ public:
MaskingFilterSession* newSession(MXS_SESSION* pSession); MaskingFilterSession* newSession(MXS_SESSION* pSession);
void diagnostics(DCB* pDcb); json_t* diagnostics();
uint64_t getCapabilities(); uint64_t getCapabilities();

4
server/modules/filter/nullfilter/nullfilter.cc
View File

@ -142,9 +142,9 @@ NullFilterSession* NullFilter::newSession(MXS_SESSION* pSession)
} }
// static // static
void NullFilter::diagnostics(DCB* pDcb) json_t* NullFilter::diagnostics()
{ {
dcb_printf(pDcb, "Hello, World!\n"); return NULL;
} }
uint64_t NullFilter::getCapabilities() uint64_t NullFilter::getCapabilities()

2
server/modules/filter/nullfilter/nullfilter.hh
View File

@ -24,7 +24,7 @@ public:
NullFilterSession* newSession(MXS_SESSION* pSession); NullFilterSession* newSession(MXS_SESSION* pSession);
void diagnostics(DCB* pDcb); json_t* diagnostics();
uint64_t getCapabilities(); uint64_t getCapabilities();

33
server/modules/filter/qlafilter/qlafilter.c
View File

@ -81,7 +81,7 @@ static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session); static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream); static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb); static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession);
static uint64_t getCapabilities(MXS_FILTER* instance); static uint64_t getCapabilities(MXS_FILTER* instance);
/** /**
@ -578,39 +578,40 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
* *
* @param instance The filter instance * @param instance The filter instance
* @param fsession Filter session, may be NULL * @param fsession Filter session, may be NULL
* @param dcb The DCB for diagnostic output
*/ */
static void static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession)
diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
{ {
QLA_INSTANCE *my_instance = (QLA_INSTANCE *) instance; QLA_INSTANCE *my_instance = (QLA_INSTANCE*)instance;
QLA_SESSION *my_session = (QLA_SESSION *) fsession; QLA_SESSION *my_session = (QLA_SESSION*)fsession;
json_t* rval = json_object();
if (my_session) if (my_session)
{ {
dcb_printf(dcb, "\t\tLogging to file %s.\n", json_object_set_new(rval, "session_filename", json_string(my_session->filename));
my_session->filename);
} }
if (my_instance->source) if (my_instance->source)
{ {
dcb_printf(dcb, "\t\tLimit logging to connections from %s\n", json_object_set_new(rval, "source", json_string(my_instance->source));
my_instance->source);
} }
if (my_instance->user_name) if (my_instance->user_name)
{ {
dcb_printf(dcb, "\t\tLimit logging to user %s\n", json_object_set_new(rval, "user", json_string(my_instance->user_name));
my_instance->user_name);
} }
if (my_instance->match) if (my_instance->match)
{ {
dcb_printf(dcb, "\t\tInclude queries that match %s\n", json_object_set_new(rval, "match", json_string(my_instance->match));
my_instance->match);
} }
if (my_instance->nomatch) if (my_instance->nomatch)
{ {
dcb_printf(dcb, "\t\tExclude queries that match %s\n", json_object_set_new(rval, "exclude", json_string(my_instance->nomatch));
my_instance->nomatch);
} }
return rval;
} }
/** /**

35
server/modules/filter/regexfilter/regexfilter.c
View File

@ -48,7 +48,7 @@ static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session); static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream); static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb); static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession);
static uint64_t getCapabilities(MXS_FILTER* instance); static uint64_t getCapabilities(MXS_FILTER* instance);
static char *regex_replace(const char *sql, pcre2_code *re, pcre2_match_data *study, static char *regex_replace(const char *sql, pcre2_code *re, pcre2_match_data *study,
@ -376,35 +376,34 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
* *
* @param instance The filter instance * @param instance The filter instance
* @param fsession Filter session, may be NULL * @param fsession Filter session, may be NULL
* @param dcb The DCB for diagnostic output
*/ */
static void static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession)
diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
{ {
REGEX_INSTANCE *my_instance = (REGEX_INSTANCE *) instance; REGEX_INSTANCE *my_instance = (REGEX_INSTANCE*)instance;
REGEX_SESSION *my_session = (REGEX_SESSION *) fsession; REGEX_SESSION *my_session = (REGEX_SESSION*)fsession;
json_t* rval = json_object();
json_object_set_new(rval, "match", json_string(my_instance->match));
json_object_set_new(rval, "replace", json_string(my_instance->replace));
dcb_printf(dcb, "\t\tSearch and replace: s/%s/%s/\n",
my_instance->match, my_instance->replace);
if (my_session) if (my_session)
{ {
dcb_printf(dcb, "\t\tNo. of queries unaltered by filter: %d\n", json_object_set_new(rval, "altered", json_integer(my_session->no_change));
my_session->no_change); json_object_set_new(rval, "unaltered", json_integer(my_session->replacements));
dcb_printf(dcb, "\t\tNo. of queries altered by filter: %d\n",
my_session->replacements);
} }
if (my_instance->source) if (my_instance->source)
{ {
dcb_printf(dcb, json_object_set_new(rval, "source", json_string(my_instance->source));
"\t\tReplacement limited to connections from %s\n",
my_instance->source);
} }
if (my_instance->user) if (my_instance->user)
{ {
dcb_printf(dcb, json_object_set_new(rval, "user", json_string(my_instance->user));
"\t\tReplacement limit to user %s\n",
my_instance->user);
} }
return rval;
} }
/** /**

40
server/modules/filter/tee/tee.c
View File

@ -106,7 +106,7 @@ static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MX
static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_UPSTREAM *upstream); static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_UPSTREAM *upstream);
static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static int clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb); static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession);
static uint64_t getCapabilities(MXS_FILTER* instance); static uint64_t getCapabilities(MXS_FILTER* instance);
/** /**
@ -697,43 +697,43 @@ clientReply(MXS_FILTER* instance, MXS_FILTER_SESSION *session, GWBUF *reply)
* *
* @param instance The filter instance * @param instance The filter instance
* @param fsession Filter session, may be NULL * @param fsession Filter session, may be NULL
* @param dcb The DCB for diagnostic output
*/ */
static void static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession)
diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
{ {
TEE_INSTANCE *my_instance = (TEE_INSTANCE *) instance; TEE_INSTANCE *my_instance = (TEE_INSTANCE*)instance;
TEE_SESSION *my_session = (TEE_SESSION *) fsession; TEE_SESSION *my_session = (TEE_SESSION*)fsession;
json_t* rval = json_object();
if (my_instance->source) if (my_instance->source)
{ {
dcb_printf(dcb, "\t\tLimit to connections from %s\n", json_object_set_new(rval, "source", json_string(my_instance->source));
my_instance->source);
} }
dcb_printf(dcb, "\t\tDuplicate statements to service %s\n",
my_instance->service->name); json_object_set_new(rval, "service", json_string(my_instance->service->name));
if (my_instance->userName) if (my_instance->userName)
{ {
dcb_printf(dcb, "\t\tLimit to user %s\n", json_object_set_new(rval, "user", json_string(my_instance->userName));
my_instance->userName);
} }
if (my_instance->match) if (my_instance->match)
{ {
dcb_printf(dcb, "\t\tInclude queries that match %s\n", json_object_set_new(rval, "match", json_string(my_instance->match));
my_instance->match);
} }
if (my_instance->nomatch) if (my_instance->nomatch)
{ {
dcb_printf(dcb, "\t\tExclude queries that match %s\n", json_object_set_new(rval, "exclude", json_string(my_instance->nomatch));
my_instance->nomatch);
} }
if (my_session) if (my_session)
{ {
dcb_printf(dcb, "\t\tNo. of statements duplicated: %d.\n", json_object_set_new(rval, "duplicated", json_integer(my_session->n_duped));
my_session->n_duped); json_object_set_new(rval, "rejected", json_integer(my_session->n_duped));
dcb_printf(dcb, "\t\tNo. of statements rejected: %d.\n",
my_session->n_rejected);
} }
return rval;
} }
/** /**

61
server/modules/filter/topfilter/topfilter.c
View File

@ -58,7 +58,7 @@ static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MX
static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_UPSTREAM *upstream); static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_UPSTREAM *upstream);
static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static int clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb); static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession);
static uint64_t getCapabilities(MXS_FILTER* instance); static uint64_t getCapabilities(MXS_FILTER* instance);
/** /**
@ -573,55 +573,62 @@ clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *reply)
* *
* @param instance The filter instance * @param instance The filter instance
* @param fsession Filter session, may be NULL * @param fsession Filter session, may be NULL
* @param dcb The DCB for diagnostic output
*/ */
static void static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession)
diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
{ {
TOPN_INSTANCE *my_instance = (TOPN_INSTANCE *) instance; TOPN_INSTANCE *my_instance = (TOPN_INSTANCE*)instance;
TOPN_SESSION *my_session = (TOPN_SESSION *) fsession; TOPN_SESSION *my_session = (TOPN_SESSION*)fsession;
int i;
json_t* rval = json_object();
json_object_set_new(rval, "report_size", json_integer(my_instance->topN));
dcb_printf(dcb, "\t\tReport size %d\n",
my_instance->topN);
if (my_instance->source) if (my_instance->source)
{ {
dcb_printf(dcb, "\t\tLimit logging to connections from %s\n", json_object_set_new(rval, "source", json_string(my_instance->source));
my_instance->source);
} }
if (my_instance->user) if (my_instance->user)
{ {
dcb_printf(dcb, "\t\tLimit logging to user %s\n", json_object_set_new(rval, "user", json_string(my_instance->user));
my_instance->user);
} }
if (my_instance->match) if (my_instance->match)
{ {
dcb_printf(dcb, "\t\tInclude queries that match %s\n", json_object_set_new(rval, "match", json_string(my_instance->match));
my_instance->match);
} }
if (my_instance->exclude) if (my_instance->exclude)
{ {
dcb_printf(dcb, "\t\tExclude queries that match %s\n", json_object_set_new(rval, "exclude", json_string(my_instance->exclude));
my_instance->exclude);
} }
if (my_session) if (my_session)
{ {
dcb_printf(dcb, "\t\tLogging to file %s.\n", json_object_set_new(rval, "session_filename", json_string(my_session->filename));
my_session->filename);
dcb_printf(dcb, "\t\tCurrent Top %d:\n", my_instance->topN); json_t* arr = json_array();
for (i = 0; i < my_instance->topN; i++)
for (int i = 0; i < my_instance->topN; i++)
{ {
if (my_session->top[i]->sql) if (my_session->top[i]->sql)
{ {
dcb_printf(dcb, "\t\t%d place:\n", i + 1); double exec_time = ((my_session->top[i]->duration.tv_sec * 1000.0)
dcb_printf(dcb, "\t\t\tExecution time: %.3f seconds\n", + (my_session->top[i]->duration.tv_usec / 1000.0)) / 1000.0;
(double) ((my_session->top[i]->duration.tv_sec * 1000)
+ (my_session->top[i]->duration.tv_usec / 1000)) / 1000); json_t* obj = json_object();
dcb_printf(dcb, "\t\t\tSQL: %s\n",
my_session->top[i]->sql); json_object_set_new(obj, "rank", json_integer(i + 1));
json_object_set_new(obj, "time", json_real(exec_time));
json_object_set_new(obj, "sql", json_string(my_session->top[i]->sql));
json_array_append(arr, obj);
} }
} }
json_object_set_new(rval, "top_queries", arr);
} }
return rval;
} }
/** /**

44
server/modules/filter/tpmfilter/tpmfilter.c
View File

@ -85,7 +85,7 @@ static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession
static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_UPSTREAM *upstream); static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_UPSTREAM *upstream);
static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static int clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue); static int clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb); static json_t* diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession);
static uint64_t getCapabilities(MXS_FILTER* instance); static uint64_t getCapabilities(MXS_FILTER* instance);
static void checkNamedPipe(void *args); static void checkNamedPipe(void *args);
@ -572,30 +572,40 @@ clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *reply)
* *
* @param instance The filter instance * @param instance The filter instance
* @param fsession Filter session, may be NULL * @param fsession Filter session, may be NULL
* @param dcb The DCB for diagnostic output
*/ */
static void static json_t*
diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb) diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession)
{ {
TPM_INSTANCE *my_instance = (TPM_INSTANCE *)instance; TPM_INSTANCE *my_instance = (TPM_INSTANCE*)instance;
TPM_SESSION *my_session = (TPM_SESSION *)fsession;
int i; json_t* rval = json_object();
if (my_instance->source) if (my_instance->source)
dcb_printf(dcb, "\t\tLimit logging to connections from %s\n", {
my_instance->source); json_object_set_new(rval, "source", json_string(my_instance->source));
}
if (my_instance->user) if (my_instance->user)
dcb_printf(dcb, "\t\tLimit logging to user %s\n", {
my_instance->user); json_object_set_new(rval, "user", json_string(my_instance->user));
}
if (my_instance->filename) if (my_instance->filename)
dcb_printf(dcb, "\t\tLogging to file %s.\n", {
my_instance->filename); json_object_set_new(rval, "filename", json_string(my_instance->filename));
}
if (my_instance->delimiter) if (my_instance->delimiter)
dcb_printf(dcb, "\t\tLogging with delimiter %s.\n", {
my_instance->delimiter); json_object_set_new(rval, "delimiter", json_string(my_instance->delimiter));
}
if (my_instance->query_delimiter) if (my_instance->query_delimiter)
dcb_printf(dcb, "\t\tLogging with query delimiter %s.\n", {
my_instance->query_delimiter); json_object_set_new(rval, "query_delimiter", json_string(my_instance->query_delimiter));
}
return rval;
} }
/** /**