You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/01/22 04:23:52 UTC
[04/10] trafficserver git commit: TS-4099: add Lua bindings for
custom metrics
TS-4099: add Lua bindings for custom metrics
Implement custom metrics in terms of Lua bindings. We export a
minimal API that constructs metrics and implicitly registers an
evaluation function. We periodically evaluate all the evaluation
functions and update their corresponding metrics.
Metrics are implicitly registered when they are loaded, so there
is no need to mention anything in mgmt/RecordsConfig.cc.
The metrics registration and evaluation syntax looks like this:
integer 'proxy.node.http.user_agents_total_documents_served' [[
proxy.process.http.incoming_requests
]]
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1a590016
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1a590016
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1a590016
Branch: refs/heads/master
Commit: 1a590016ae2dd2e1f868a57eec668cda886c4368
Parents: e9649d2
Author: James Peach <jp...@apache.org>
Authored: Tue Nov 24 16:19:37 2015 -0800
Committer: James Peach <jp...@apache.org>
Committed: Thu Jan 21 18:52:18 2016 -0800
----------------------------------------------------------------------
cmd/traffic_manager/AddConfigFilesHere.cc | 1 +
cmd/traffic_manager/Makefile.am | 21 +-
cmd/traffic_manager/metrics.cc | 398 ++++++
cmd/traffic_manager/metrics.h | 31 +
cmd/traffic_manager/traffic_manager.cc | 47 +-
mgmt/RecordsConfig.cc | 2 +
proxy/config/Makefile.am | 5 +-
proxy/config/metrics.config.default | 1802 ++++++++++++++++++++++++
8 files changed, 2299 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a590016/cmd/traffic_manager/AddConfigFilesHere.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/AddConfigFilesHere.cc b/cmd/traffic_manager/AddConfigFilesHere.cc
index 34bc1da..2cd111c 100644
--- a/cmd/traffic_manager/AddConfigFilesHere.cc
+++ b/cmd/traffic_manager/AddConfigFilesHere.cc
@@ -84,5 +84,6 @@ initializeRegistry()
configFiles->addFile("splitdns.config", false);
configFiles->addFile("ssl_multicert.config", false);
configFiles->addFile("stats.config.xml", false);
+ configFiles->addFile("metrics.config", false);
configFiles->registerCallback(testcall);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a590016/cmd/traffic_manager/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index fecdd49..7b615fd 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -18,6 +18,7 @@
bin_PROGRAMS = traffic_manager
AM_CPPFLAGS = \
+ $(LUAJIT_CPPFLAGS) \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
@@ -28,7 +29,11 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/utils \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/luajit/src
+
+AM_CXXFLAGS += \
+ $(LUAJIT_CFLAGS)
AM_LDFLAGS = \
@EXTRA_CXX_LDFLAGS@ \
@@ -36,9 +41,13 @@ AM_LDFLAGS = \
@EXPAT_LDFLAGS@ \
@OPENSSL_LDFLAGS@
+AM_LDFLAGS += \
+ $(LUAJIT_LDFLAGS)
+
traffic_manager_SOURCES = \
AddConfigFilesHere.cc \
traffic_manager.cc \
+ metrics.cc \
StatProcessor.cc \
StatProcessor.h \
StatType.cc \
@@ -58,7 +67,15 @@ traffic_manager_LDADD = \
$(top_builddir)/lib/ts/libtsutil.la \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/proxy/shared/liberror.a \
- $(top_builddir)/proxy/shared/libdiagsconfig.a \
+ $(top_builddir)/proxy/shared/libdiagsconfig.a
+
+if BUILD_LUAJIT
+traffic_manager_LDADD += \
+ $(top_builddir)/lib/bindings/libbindings.la \
+ $(top_builddir)/lib/luajit/src/libluajit.a
+endif
+
+traffic_manager_LDADD +=\
$(LIBUNWIND_LIBS) \
@LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ \
-lm
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a590016/cmd/traffic_manager/metrics.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/metrics.cc b/cmd/traffic_manager/metrics.cc
new file mode 100644
index 0000000..7bc5bec
--- /dev/null
+++ b/cmd/traffic_manager/metrics.cc
@@ -0,0 +1,398 @@
+/** @file
+ *
+ * Traffic Manager custom metrics.
+ *
+ * @section license License
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ts/ink_config.h"
+#include "ts/ink_memory.h"
+#include "ts/Ptr.h"
+#include "ts/Vec.h"
+#include "ts/I_Layout.h"
+#include "bindings/bindings.h"
+#include "bindings/metrics.h"
+#include "I_RecCore.h"
+#include "MgmtDefs.h"
+#include "MgmtUtils.h"
+#include "WebOverview.h"
+#include "metrics.h"
+
+struct Evaluator {
+ Evaluator() : rec_name(NULL), data_type(RECD_NULL), ref(-1) {}
+
+ ~Evaluator()
+ {
+ ats_free(this->rec_name);
+ ink_release_assert(this->ref == -1);
+ }
+
+ bool
+ bind(lua_State *L, const char *metric, const char *expression)
+ {
+ if (RecGetRecordDataType(metric, &this->data_type) != REC_ERR_OKAY) {
+ return false;
+ }
+
+ this->rec_name = ats_strdup(metric);
+
+ switch (luaL_loadstring(L, expression)) {
+ case LUA_ERRSYNTAX:
+ case LUA_ERRMEM:
+ Debug("lua", "loadstring failed for %s", metric);
+ luaL_error(L, "invalid expression for %s", metric);
+ return false;
+ case 0:
+ break; // success
+ }
+
+ // The loaded chunk is now on the top of the stack. Stuff it into the registry
+ // so we can evaluate it later.
+ this->ref = luaL_ref(L, LUA_REGISTRYINDEX);
+
+ return true;
+ }
+
+ void
+ eval(lua_State *L) const
+ {
+ // Push the stashed expression chunk onto the stack.
+ lua_rawgeti(L, LUA_REGISTRYINDEX, this->ref);
+
+ // Evaluate it. Note that we don't emit a warning for
+ // evaluation errors. This is because not all metrics (eg.
+ // cache metrics) are available early in startup so we don't
+ // want to log spurious warning. Unfortunately it means that
+ // to check your config for errors you need to enable
+ // diagnostic tags.
+ lua_pushstring(L, this->rec_name);
+ if (lua_pcall(L, 1 /* nargs */, 1 /* nresults */, 0) != 0) {
+ Debug("lua", "failed to evaluate %s: %s", this->rec_name, lua_tostring(L, -1));
+ lua_pop(L, 1);
+ return;
+ }
+
+ // If we got a return value, set it on the record. Records can return nil to
+ // indicate they don't want to be set on this round.
+ if (!lua_isnil(L, -1)) {
+ RecData rec_value;
+
+ switch (this->data_type) {
+ case RECD_INT:
+ rec_value.rec_int = lua_tointeger(L, -1);
+ break;
+ case RECD_COUNTER:
+ rec_value.rec_counter = lua_tointeger(L, -1);
+ break;
+ case RECD_FLOAT:
+ // Lua will eval 0/0 to NaN rather than 0.
+ rec_value.rec_float = lua_tonumber(L, -1);
+ if (isnan(rec_value.rec_float)) {
+ rec_value.rec_float = 0.0;
+ }
+ break;
+ default:
+ goto done;
+ }
+
+ RecSetRecord(RECT_NULL, this->rec_name, this->data_type, &rec_value, NULL, REC_SOURCE_EXPLICIT);
+ }
+
+ done:
+ // Pop the return value.
+ lua_pop(L, 1);
+ }
+
+private:
+ char *rec_name;
+ RecDataT data_type;
+
+ int ref;
+};
+
+struct EvaluatorList {
+ EvaluatorList() : passes(0) {}
+ ~EvaluatorList()
+ {
+ forv_Vec(Evaluator, e, this->evaluators) { delete e; }
+ }
+
+ void
+ push_back(Evaluator *e)
+ {
+ evaluators.push_back(e);
+ }
+
+ void
+ evaluate(lua_State *L) const
+ {
+ ink_hrtime start = ink_get_hrtime_internal();
+ ink_hrtime elapsed;
+
+ forv_Vec(Evaluator, e, this->evaluators) { e->eval(L); }
+
+
+ elapsed = ink_hrtime_diff(ink_get_hrtime_internal(), start);
+ Debug("lua", "evaluated %u metrics in %fmsec", evaluators.length(), ink_hrtime_to_usec(elapsed) / 1000.0);
+ }
+
+ int64_t passes;
+ Vec<Evaluator *> evaluators;
+};
+
+static int64_t
+timestamp_now_msec()
+{
+ ink_hrtime now = ink_get_hrtime_internal();
+ return ink_hrtime_to_msec(now);
+}
+
+static int
+metrics_register_evaluator(lua_State *L)
+{
+ const char *metric;
+ const char *chunk;
+ Evaluator *eval;
+ EvaluatorList *evaluators;
+ BindingInstance *binding = BindingInstance::self(L);
+
+ // The metric name is the first upvalue (from the record creation closure).
+ metric = lua_tostring(L, lua_upvalueindex(1));
+ // The evaluation chunk is the (only) argument.
+ chunk = lua_tostring(L, -1);
+
+ binding = BindingInstance::self(L);
+ evaluators = (EvaluatorList *)binding->retrieve_ptr("evaluators");
+
+ ink_release_assert(evaluators != NULL);
+
+ eval = new Evaluator();
+ eval->bind(L, metric, chunk);
+
+ evaluators->push_back(eval);
+ return 0;
+}
+
+static int
+metrics_create_record(lua_State *L, RecDataT data_type)
+{
+ const char *name;
+ RecT rec_type = RECT_NULL;
+ int error = REC_ERR_FAIL;
+
+ BindingInstance::typecheck(L, "record.create", LUA_TSTRING, LUA_TNONE);
+
+ // Get the name of the record to create.
+ name = lua_tostring(L, -1);
+
+ if (strncmp(name, "proxy.process.", sizeof("proxy.process.") - 1) == 0) {
+ rec_type = RECT_PROCESS;
+ } else if (strncmp(name, "proxy.node.", sizeof("proxy.node.") - 1) == 0) {
+ rec_type = RECT_NODE;
+ } else if (strncmp(name, "proxy.cluster.", sizeof("proxy.cluster.") - 1) == 0) {
+ rec_type = RECT_CLUSTER;
+ }
+
+ // You have to follow the naming convention.
+ if (rec_type == RECT_NULL) {
+ luaL_error(L, "invalid metric name '%s'", name);
+ }
+
+ switch (data_type) {
+ case RECD_INT:
+ error = RecRegisterStatInt(rec_type, name, 0, RECP_NON_PERSISTENT);
+ break;
+ case RECD_FLOAT:
+ error = RecRegisterStatFloat(rec_type, name, 0, RECP_NON_PERSISTENT);
+ break;
+ case RECD_COUNTER:
+ error = RecRegisterStatCounter(rec_type, name, 0, RECP_NON_PERSISTENT);
+ break;
+ default:
+ break;
+ }
+
+ if (error != REC_ERR_OKAY) {
+ luaL_error(L, "failed to register metric '%s'", name);
+ }
+
+ // Push a copy of the metric name onto the stack.
+ lua_pushvalue(L, -1);
+ // Push the Evaluator as a closure with the metric name as an upvalue.
+ lua_pushcclosure(L, metrics_register_evaluator, 1);
+
+ Debug("lua", "registered %s as record type %d", name, rec_type);
+ return 1;
+}
+
+static int
+metrics_create_integer(lua_State *L)
+{
+ return metrics_create_record(L, RECD_INT);
+}
+
+static int
+metrics_create_counter(lua_State *L)
+{
+ return metrics_create_record(L, RECD_COUNTER);
+}
+
+static int
+metrics_create_float(lua_State *L)
+{
+ return metrics_create_record(L, RECD_FLOAT);
+}
+
+static int
+metrics_cluster_sum(lua_State *L)
+{
+ const char *rec_name;
+ RecDataT data_type;
+ RecData rec_data;
+
+ // Get the name of the record to sum.
+ rec_name = lua_tostring(L, -1);
+
+ // XXX Check whether we have a cached value for this somewhere ...
+
+ // If not, get the record data type.
+ if (RecGetRecordDataType(rec_name, &data_type) == REC_ERR_FAIL) {
+ luaL_error(L, "unknown metric name '%s'", rec_name);
+ }
+
+ // Sum the cluster value.
+ if (!overviewGenerator->varClusterDataFromName(data_type, rec_name, &rec_data)) {
+ RecDataClear(data_type, &rec_data);
+
+ // If we can't get any cluster data, return nil. This will generally cause the
+ // evaluator to fail, which is handled by logging and ignoring the failure.
+ lua_pushnil(L);
+ return 1;
+ }
+
+ switch (data_type) {
+ case RECD_INT: /* fallthru */
+ case RECD_COUNTER:
+ lua_pushinteger(L, rec_data.rec_int);
+ break;
+ case RECD_FLOAT:
+ lua_pushnumber(L, rec_data.rec_float);
+ break;
+ case RECD_STRING:
+ lua_pushlstring(L, rec_data.rec_string, strlen(rec_data.rec_string));
+ break;
+ default:
+ lua_pushnil(L);
+ }
+
+ // Return 1 value on the stack.
+ return 1;
+}
+
+static void
+register_metrics_namespace(BindingInstance &binding)
+{
+ // XXX Currently known metrics namespace prefixes. Figure out a way to
+ // add new metrics nodes as new prefixes are added.
+ const char *prefixes[] = {
+ "proxy.cluster", "proxy.cluster.cache", "proxy.cluster.cache.contents", "proxy.cluster.dns", "proxy.cluster.hostdb",
+ "proxy.cluster.http", "proxy.cluster.log", "proxy.node", "proxy.node.cache", "proxy.node.cache.contents", "proxy.node.cluster",
+ "proxy.node.config", "proxy.node.config.restart_required", "proxy.node.dns", "proxy.node.hostdb", "proxy.node.http",
+ "proxy.node.http.transaction_counts_avg_10s", "proxy.node.http.transaction_counts_avg_10s.errors",
+ "proxy.node.http.transaction_counts_avg_10s.other", "proxy.node.http.transaction_frac_avg_10s",
+ "proxy.node.http.transaction_frac_avg_10s.errors", "proxy.node.http.transaction_frac_avg_10s.other",
+ "proxy.node.http.transaction_msec_avg_10s", "proxy.node.http.transaction_msec_avg_10s.errors",
+ "proxy.node.http.transaction_msec_avg_10s.other", "proxy.node.log", "proxy.node.restarts.manager", "proxy.node.restarts.proxy",
+ "proxy.node.version.manager", "proxy.process.cache", "proxy.process.cache.direntries", "proxy.process.cache.evacuate",
+ "proxy.process.cache.frags_per_doc", "proxy.process.cache.frags_per_doc.3+", "proxy.process.cache.lookup",
+ "proxy.process.cache.ram_cache", "proxy.process.cache.read", "proxy.process.cache.read_busy", "proxy.process.cache.remove",
+ "proxy.process.cache.scan", "proxy.process.cache.sync", "proxy.process.cache.update", "proxy.process.cache.write",
+ "proxy.process.cache.write.backlog", "proxy.process.cluster", "proxy.process.congestion", "proxy.process.dns",
+ "proxy.process.hostdb", "proxy.process.http", "proxy.process.http.milestone", "proxy.process.http.transaction_counts",
+ "proxy.process.http.transaction_counts.errors", "proxy.process.http.transaction_counts.hit_fresh",
+ "proxy.process.http.transaction_counts.other", "proxy.process.http.transaction_totaltime",
+ "proxy.process.http.transaction_totaltime.errors", "proxy.process.http.transaction_totaltime.hit_fresh",
+ "proxy.process.http.transaction_totaltime.other", "proxy.process.http.websocket", "proxy.process.http2", "proxy.process.https",
+ "proxy.process.log", "proxy.process.net", "proxy.process.socks", "proxy.process.ssl", "proxy.process.ssl.cipher.user_agent",
+ "proxy.process.version.server",
+ };
+
+ // Register the metrics userdata type.
+ lua_metrics_register(binding.lua);
+
+ // Bind metric nodes to all the metrics namespace prefixes.
+ for (unsigned i = 0; i < countof(prefixes); ++i) {
+ if (lua_metrics_new(prefixes[i], binding.lua) == 1) {
+ binding.bind_value(prefixes[i], -1);
+ lua_pop(binding.lua, 1);
+ }
+ }
+}
+
+bool
+metrics_binding_initialize(BindingInstance &binding)
+{
+ ats_scoped_str sysconfdir(RecConfigReadConfigDir());
+ ats_scoped_str config(Layout::get()->relative_to(sysconfdir, "metrics.config"));
+
+ if (!binding.construct()) {
+ mgmt_fatal(stderr, 0, "failed to initialize Lua runtime\n");
+ }
+
+ // Register the metrics bindings.
+ register_metrics_namespace(binding);
+
+ // Register our own API.
+ binding.bind_function("integer", metrics_create_integer);
+ binding.bind_function("counter", metrics_create_counter);
+ binding.bind_function("float", metrics_create_float);
+ binding.bind_function("metrics.cluster.sum", metrics_cluster_sum);
+
+ binding.bind_constant("metrics.now.msec", timestamp_now_msec());
+ binding.bind_constant("metrics.update.pass", int64_t(0));
+
+ // Stash a backpointer to the evaluators.
+ binding.attach_ptr("evaluators", new EvaluatorList());
+
+ // Finally, execute the config file.
+ return binding.require(config.get());
+}
+
+void
+metrics_binding_destroy(BindingInstance &binding)
+{
+ EvaluatorList *evaluators;
+
+ evaluators = (EvaluatorList *)binding.retrieve_ptr("evaluators");
+ binding.attach_ptr("evaluators", NULL);
+ delete evaluators;
+}
+
+void
+metrics_binding_evaluate(BindingInstance &binding)
+{
+ EvaluatorList *evaluators;
+
+ evaluators = (EvaluatorList *)binding.retrieve_ptr("evaluators");
+ ink_release_assert(evaluators != NULL);
+
+ binding.bind_constant("metrics.now.msec", timestamp_now_msec());
+ binding.bind_constant("metrics.update.pass", ++evaluators->passes);
+ evaluators->evaluate(binding.lua);
+}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a590016/cmd/traffic_manager/metrics.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/metrics.h b/cmd/traffic_manager/metrics.h
new file mode 100644
index 0000000..4bc97ce
--- /dev/null
+++ b/cmd/traffic_manager/metrics.h
@@ -0,0 +1,31 @@
+/** @file
+ *
+ * Traffic Manager custom metrics.
+ *
+ * @section license License
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B
+#define METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B
+
+bool metrics_binding_initialize(BindingInstance &binding);
+void metrics_binding_destroy(BindingInstance &binding);
+void metrics_binding_evaluate(BindingInstance &binding);
+
+#endif /* METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a590016/cmd/traffic_manager/traffic_manager.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index f12da0a..cae77b8 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -51,6 +51,10 @@
#include "StatProcessor.h"
#include "P_RecLocal.h"
+#include "bindings/bindings.h"
+#include "bindings/metrics.h"
+#include "metrics.h"
+
#if TS_USE_POSIX_CAP
#include <sys/capability.h>
#endif
@@ -87,8 +91,10 @@ static const char *recs_conf = "records.config";
static int fds_limit;
+static int metrics_version;
+
// TODO: Use positive instead negative selection
-// Thsis should just be #if defined(solaris)
+// This should just be #if defined(solaris)
#if !defined(linux) && !defined(freebsd) && !defined(darwin)
static void SignalHandler(int sig, siginfo_t *t, void *f);
static void SignalAlrmHandler(int sig, siginfo_t *t, void *f);
@@ -437,11 +443,15 @@ main(int argc, const char **argv)
int proxy_backdoor = -1;
char *group_addr = NULL, *tsArgs = NULL;
bool disable_syslog = false;
+ RecBool enable_lua = false;
char userToRunAs[MAX_LOGIN + 1];
RecInt fds_throttle = -1;
time_t ticker;
ink_thread synthThrId;
+ int binding_version = 0;
+ BindingInstance *binding = NULL;
+
ArgumentDescription argument_descriptions[] = {
{"proxyOff", '-', "Disable proxy", "F", &proxy_off, NULL, NULL},
{"aconfPort", '-', "Autoconf port", "I", &aconf_port_arg, "MGMT_ACONF_PORT", NULL},
@@ -508,6 +518,7 @@ main(int argc, const char **argv)
}
RecGetRecordInt("proxy.config.net.connections_throttle", &fds_throttle);
+ RecGetRecordBool("proxy.config.stats.enable_lua", &enable_lua);
set_process_limits(fds_throttle); // as root
@@ -727,12 +738,28 @@ main(int argc, const char **argv)
RecRegisterStatInt(RECT_NODE, "proxy.node.config.restart_required.manager", 0, RECP_NON_PERSISTENT);
RecRegisterStatInt(RECT_NODE, "proxy.node.config.restart_required.cop", 0, RECP_NON_PERSISTENT);
+ if (enable_lua) {
+ binding = new BindingInstance;
+ metrics_binding_initialize(*binding);
+ }
+
int sleep_time = 0; // sleep_time given in sec
for (;;) {
lmgmt->processEventQueue();
lmgmt->pollMgmtProcessServer();
+ if (enable_lua) {
+ if (binding_version != metrics_version) {
+ metrics_binding_destroy(*binding);
+ delete binding;
+
+ binding = new BindingInstance;
+ metrics_binding_initialize(*binding);
+ binding_version = metrics_version;
+ }
+ }
+
// Handle rotation of output log (aka traffic.out) as well as DIAGS_LOG_FILENAME (aka manager.log)
rotateLogs();
@@ -762,8 +789,12 @@ main(int argc, const char **argv)
lmgmt->ccom->checkPeers(&ticker);
overviewGenerator->checkForUpdates();
- if (statProcessor) {
- statProcessor->processStat();
+ if (enable_lua) {
+ metrics_binding_evaluate(*binding);
+ } else {
+ if (statProcessor) {
+ statProcessor->processStat();
+ }
}
if (lmgmt->mgmt_shutdown_outstanding != MGMT_PENDING_NONE) {
@@ -834,8 +865,13 @@ main(int argc, const char **argv)
}
}
+ if (binding) {
+ metrics_binding_destroy(*binding);
+ delete binding;
+ }
+
if (statProcessor) {
- delete (statProcessor);
+ delete statProcessor;
}
#ifndef MGMT_SERVICE
@@ -1020,6 +1056,9 @@ fileUpdated(char *fname, bool incVersion)
statProcessor->rereadConfig(configFiles);
}
mgmt_log(stderr, "[fileUpdated] stats.config.xml file has been modified\n");
+ } else if (strcmp(fname, "metrics.config") == 0) {
+ ink_atomic_increment(&metrics_version, 1);
+ mgmt_log(stderr, "[fileUpdated] metrics.config file has been modified\n");
} else if (strcmp(fname, "congestion.config") == 0) {
lmgmt->signalFileChange("proxy.config.http.congestion_control.filename");
} else {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a590016/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 4a3ec43..9eea1b3 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1120,6 +1120,8 @@ static const RecordElement RecordsConfig[] =
// Jira TS-21
{RECT_CONFIG, "proxy.config.stats.snap_file", RECD_STRING, "stats.snap", RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
+ {RECT_CONFIG, "proxy.config.stats.enable_lua", RECD_INT, "0", RECU_RESTART_TM, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
+ ,
// ###########
// # Parsing #
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a590016/proxy/config/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/config/Makefile.am b/proxy/config/Makefile.am
index 9e654d7..6625990 100644
--- a/proxy/config/Makefile.am
+++ b/proxy/config/Makefile.am
@@ -35,15 +35,16 @@ dist_sysconf_DATA = \
ip_allow.config.default \
log_hosts.config.default \
logs_xml.config.default \
+ metrics.config.default \
parent.config.default \
- volume.config.default \
plugin.config.default \
remap.config.default \
socks.config.default \
splitdns.config.default \
ssl_multicert.config.default \
stats.config.xml.default \
- vaddrs.config.default
+ vaddrs.config.default \
+ volume.config.default
install-exec-hook:
for dfltcfgfile in $(dist_sysconf_DATA) $(nodist_sysconf_DATA) ; \