You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by as...@apache.org on 2019/12/09 11:41:39 UTC

[oozie] branch master updated: OOZIE-3566 Wrong numbers provided by Oozie monitoring webservices.requests sampler (cas via asalamon74)

This is an automated email from the ASF dual-hosted git repository.

asalamon74 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new 77b093d  OOZIE-3566 Wrong numbers provided by Oozie monitoring webservices.requests sampler (cas via asalamon74)
77b093d is described below

commit 77b093ddec7dda5597fcf24ec24f5564394cf007
Author: Andras Salamon <as...@apache.org>
AuthorDate: Mon Dec 9 12:41:10 2019 +0100

    OOZIE-3566 Wrong numbers provided by Oozie monitoring webservices.requests sampler (cas via asalamon74)
---
 core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java | 4 ++--
 release-log.txt                                                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
index b216416..714ebfa 100644
--- a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
@@ -295,11 +295,11 @@ public abstract class JsonRestServlet extends HttpServlet {
         requestCron.set(cron);
         try {
             cron.start();
+            TOTAL_REQUESTS_SAMPLER_COUNTER.incrementAndGet();
+            samplerCounter.incrementAndGet();
             validateRestUrl(request.getMethod(), getResourceName(request), request.getParameterMap());
             XLog.Info.get().clear();
             String user = getUser(request);
-            TOTAL_REQUESTS_SAMPLER_COUNTER.incrementAndGet();
-            samplerCounter.incrementAndGet();
             //If trace is enabled then display the request headers
             XLog log = XLog.getLog(getClass());
             if (log.isTraceEnabled()){
diff --git a/release-log.txt b/release-log.txt
index 98ec4cd..2a6a8a9 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.3.0 release (trunk - unreleased)
 
+OOZIE-3566 Wrong numbers provided by Oozie monitoring webservices.requests sampler (cas via asalamon74)
 OOZIE-3557 [build] Update required minimum maven version (asalamon74 via kmarton)
 OOZIE-3538 Invalid <perCoreThreadCount> value is pom.xml (nobigo via asalamon74)
 OOZIE-3549 Add back support for truststore passwords (matijhs via asalamon74)