You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/01/12 16:14:40 UTC
[5/9] incubator-tinkerpop git commit: Deprecate local error metric in
Gremlin Server
Deprecate local error metric in Gremlin Server
The local error metric was double counting errors as there was already a global error catching such things. Deprecated in case someone had extended these two classes and was using that class somehow.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bc1fc5e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bc1fc5e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bc1fc5e8
Branch: refs/heads/master
Commit: bc1fc5e8931472a9c41b46dce03848a30cd7d59b
Parents: f34bde7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 16 11:57:45 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Dec 16 11:57:45 2015 -0500
----------------------------------------------------------------------
.../gremlin/server/handler/OpSelectorHandler.java | 10 +++++++++-
.../gremlin/server/op/AbstractEvalOpProcessor.java | 11 ++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bc1fc5e8/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
index 6ef65e2..816251f 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
@@ -50,6 +50,15 @@ import static com.codahale.metrics.MetricRegistry.name;
@ChannelHandler.Sharable
public class OpSelectorHandler extends MessageToMessageDecoder<RequestMessage> {
private static final Logger logger = LoggerFactory.getLogger(OpSelectorHandler.class);
+
+ /**
+ * Captures the "error" count as a reportable metric for Gremlin Server.
+ *
+ * @deprecated As of release 3.1.1-incubating, not replaced. Direct usage is discouraged with sub-classes as
+ * error counts are captured more globally for error messages written down the pipeline to
+ * {@link GremlinResponseFrameEncoder}.
+ */
+ @Deprecated
static final Meter errorMeter = MetricManager.INSTANCE.getMeter(name(GremlinServer.class, "errors"));
private final Settings settings;
@@ -84,7 +93,6 @@ public class OpSelectorHandler extends MessageToMessageDecoder<RequestMessage> {
throw new OpProcessorException(errorMessage, ResponseMessage.build(msg).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).result(errorMessage).create());
}
} catch (OpProcessorException ope) {
- errorMeter.mark();
logger.warn(ope.getMessage(), ope);
ctx.writeAndFlush(ope.getResponseMessage());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bc1fc5e8/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index abaa8b5..3df9156 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
import org.apache.tinkerpop.gremlin.server.GraphManager;
import org.apache.tinkerpop.gremlin.server.handler.Frame;
+import org.apache.tinkerpop.gremlin.server.handler.GremlinResponseFrameEncoder;
import org.apache.tinkerpop.gremlin.server.handler.StateKey;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.server.Context;
@@ -67,6 +68,15 @@ import static com.codahale.metrics.MetricRegistry.name;
public abstract class AbstractEvalOpProcessor implements OpProcessor {
private static final Logger logger = LoggerFactory.getLogger(AbstractEvalOpProcessor.class);
public static final Timer evalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "eval"));
+
+ /**
+ * Captures the "error" count as a reportable metric for Gremlin Server.
+ *
+ * @deprecated As of release 3.1.1-incubating, not replaced. Direct usage is discouraged with sub-classes as
+ * error counts are captured more globally for error messages written down the pipeline to
+ * {@link GremlinResponseFrameEncoder}.
+ */
+ @Deprecated
static final Meter errorMeter = MetricManager.INSTANCE.getMeter(name(GremlinServer.class, "errors"));
/**
@@ -320,7 +330,6 @@ public abstract class AbstractEvalOpProcessor implements OpProcessor {
.result(aggregate).create())));
}
} catch (Exception ex) {
- errorMeter.mark();
logger.warn("The result [{}] in the request {} could not be serialized and returned.", aggregate, msg.getRequestId(), ex);
final String errorMessage = String.format("Error during serialization: %s",
ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage());