airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject airavata git commit: cleanup
Date Sun, 02 Oct 2016 03:21:57 GMT
Repository: airavata
Updated Branches:
  refs/heads/lahiru/AIRAVATA-2107 e66ec2362 -> d3482d944


cleanup


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d3482d94
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d3482d94
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d3482d94

Branch: refs/heads/lahiru/AIRAVATA-2107
Commit: d3482d944ed9a074e3aae17c1767c5f3d5fc834f
Parents: e66ec23
Author: Lahiru Ginnaliya Gamathige <lahiru@apache.org>
Authored: Sat Oct 1 20:21:47 2016 -0700
Committer: Lahiru Ginnaliya Gamathige <lahiru@apache.org>
Committed: Sat Oct 1 20:21:47 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/airavata/gfac/core/GFacThreadPoolExecutor.java | 2 ++
 .../java/org/apache/airavata/gfac/server/GfacServerHandler.java    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/d3482d94/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacThreadPoolExecutor.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacThreadPoolExecutor.java
index bf6dca6..fac96e0 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacThreadPoolExecutor.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacThreadPoolExecutor.java
@@ -37,6 +37,7 @@ public class GFacThreadPoolExecutor {
     private static ExecutorService threadPool;
     private static Histogram threadPoolQueueSize = Kamon.metrics().histogram("GFacThreadPoolExecutor.queue-size");
     private static Histogram threadPoolActiveThreads = Kamon.metrics().histogram("GFacThreadPoolExecutor.active-threads");
+    private static Histogram threadPoolTotalThreads = Kamon.metrics().histogram("OrchestratorServerThreadPoolExecutor.total-threads");
 
 
     public static ExecutorService getCachedThreadPool() {
@@ -61,5 +62,6 @@ public class GFacThreadPoolExecutor {
     public static void record() {
         threadPoolQueueSize.record(((ThreadPoolExecutor)threadPool).getQueue().size());
         threadPoolActiveThreads.record(((ThreadPoolExecutor)threadPool).getActiveCount());
+        threadPoolTotalThreads.record(((ThreadPoolExecutor)threadPool).getPoolSize());
     }
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3482d94/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 035543e..4009c24 100644
--- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -94,7 +94,6 @@ public class GfacServerHandler implements GfacService.Iface {
     private MinMaxCounter consumedCount = Kamon.metrics().minMaxCounter(String.format("%s.consumed-count",
getClass().getName()));
     private Histogram threadPoolQueueSize = Kamon.metrics().histogram(String.format("%s.queue-size",
getClass().getName()));
     private Histogram threadPoolActiveThreads = Kamon.metrics().histogram(String.format("%s.active-threads",
getClass().getName()));
-    private Histogram threadPoolTotalThreads = Kamon.metrics().histogram(String.format("%s.total-threads",
getClass().getName()));
 
 
     public GfacServerHandler() throws AiravataStartupException {
@@ -186,7 +185,6 @@ public class GfacServerHandler implements GfacService.Iface {
     private void recordThreadPool() {
         threadPoolQueueSize.record(((ThreadPoolExecutor)executorService).getQueue().size());
         threadPoolActiveThreads.record(((ThreadPoolExecutor)executorService).getActiveCount());
-        threadPoolTotalThreads.record(((ThreadPoolExecutor)executorService).getPoolSize());
     }
 
     @Override


Mime
View raw message