Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F19E218740 for ; Wed, 24 Feb 2016 22:14:49 +0000 (UTC) Received: (qmail 89080 invoked by uid 500); 24 Feb 2016 22:14:15 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 89048 invoked by uid 500); 24 Feb 2016 22:14:15 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 89039 invoked by uid 99); 24 Feb 2016 22:14:15 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2016 22:14:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 313C21A0012 for ; Wed, 24 Feb 2016 22:14:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id oDv437ug2hSD for ; Wed, 24 Feb 2016 22:14:03 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id B1B565FB27 for ; Wed, 24 Feb 2016 22:14:01 +0000 (UTC) Received: (qmail 69149 invoked by uid 99); 24 Feb 2016 22:07:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2016 22:07:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D955CE8EDB; Wed, 24 Feb 2016 22:07:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Wed, 24 Feb 2016 22:07:29 -0000 Message-Id: <685c11672e9e4828827886308eabb75d@git.apache.org> In-Reply-To: <86bf10aa7fc2419abf319471338d66ad@git.apache.org> References: <86bf10aa7fc2419abf319471338d66ad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/20] incubator-geode git commit: GEODE-907: Switch all fields from floats to doubles GEODE-907: Switch all fields from floats to doubles - This is because when Jackson serializes a float (to JSON) it does so through an implicit cast to a double which alters the precision. Practically, a number like 23.99F ends up being 23.98999999234D which messes with unit tests and displaying in the UI. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/022733e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/022733e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/022733e8 Branch: refs/heads/feature/GEODE-953 Commit: 022733e8837b15b415c466a2e59874e09165e1c1 Parents: e623d8e Author: Jens Deppe Authored: Sat Feb 20 12:15:24 2016 -0800 Committer: Jens Deppe Committed: Tue Feb 23 14:04:51 2016 -0800 ---------------------------------------------------------------------- .../tools/pulse/internal/data/Cluster.java | 232 +++++++++---------- .../pulse/internal/data/JMXDataUpdater.java | 62 ++--- .../service/ClusterDiskThroughputService.java | 4 +- .../service/ClusterGCPausesService.java | 4 +- .../internal/service/ClusterMemberService.java | 15 +- .../service/ClusterMembersRGraphService.java | 15 +- .../internal/service/ClusterRegionService.java | 1 + .../service/ClusterSelectedRegionService.java | 6 +- .../controllers/PulseControllerJUnitTest.java | 35 +-- .../pulse/testbed/PropMockDataUpdater.java | 8 +- .../gemfire/tools/pulse/tests/Member.java | 16 +- .../gemfire/tools/pulse/tests/MemberMBean.java | 8 +- .../tools/pulse/tests/PulseBaseTest.java | 16 +- .../gemfire/tools/pulse/tests/PulseTest.java | 2 - .../gemfire/tools/pulse/tests/Region.java | 20 +- .../gemfire/tools/pulse/tests/RegionMBean.java | 10 +- .../tools/pulse/tests/RegionOnMember.java | 16 +- .../tools/pulse/tests/RegionOnMemberMBean.java | 8 +- .../gemfire/tools/pulse/tests/ServerObject.java | 25 +- .../tools/pulse/tests/ServerObjectMBean.java | 10 +- 20 files changed, 258 insertions(+), 255 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java index 60b353e..7d5cac2 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java @@ -75,7 +75,7 @@ public class Cluster extends Thread { private String serverName; private String port; private int stale = 0; - private float loadPerSec; + private double loadPerSec; // start: fields defined in System MBean private IClusterUpdater updater = null; @@ -84,25 +84,25 @@ public class Cluster extends Thread { private long clientConnectionCount; private int locatorCount; private int totalRegionCount; - private Long totalHeapSize = 0L; - private Long totalRegionEntryCount; + private long totalHeapSize = 0L; + private long totalRegionEntryCount; private int currentQueryCount; - private Long totalBytesOnDisk; - private float diskReadsRate; - private float diskWritesRate; - private float writePerSec; - private float readPerSec; - private float queriesPerSec; + private long totalBytesOnDisk; + private double diskReadsRate; + private double diskWritesRate; + private double writePerSec; + private double readPerSec; + private double queriesPerSec; private int avgDiskStorage; private int avgDiskWritesRate; private int runningFunctionCount; - private Long registeredCQCount; + private long registeredCQCount; private int subscriptionCount; private int serverCount; private int txnCommittedCount; private int txnRollbackCount; - private Long usedHeapSize = 0L; - private Long garbageCollectionCount = 0L; + private long usedHeapSize = 0L; + private long garbageCollectionCount = 0L; private int clusterId; private int notificationPageNumber = 1; private boolean connectedFlag; @@ -135,7 +135,7 @@ public class Cluster extends Thread { MAX_SAMPLE_SIZE); private CircularFifoBuffer garbageCollectionTrend = new CircularFifoBuffer( MAX_SAMPLE_SIZE); - private Long previousJVMPauseCount = 0L; + private long previousJVMPauseCount = 0L; private HashMap wanInformation = new HashMap(); private Map clusterStatementMap = new ConcurrentHashMap(); @@ -246,22 +246,22 @@ public class Cluster extends Thread { private long totalBytesOnDisk; private String memberPort; - private Float cpuUsage = 0.0f; - private Float hostCpuUsage = 0.0f; - private Long uptime; + private double cpuUsage = 0.0d; + private double hostCpuUsage = 0.0d; + private long uptime; private String name; - private float getsRate; - private float putsRate; + private double getsRate; + private double putsRate; private boolean isCache; private boolean isGateway; private boolean isLocator; private boolean isServer; - private Double loadAverage; + private double loadAverage; private int numThreads; - private Long totalFileDescriptorOpen; - private Long garbageCollectionCount = 0L; - private float throughputWrites; - private float throughputReads; + private long totalFileDescriptorOpen; + private long garbageCollectionCount = 0L; + private double throughputWrites; + private double throughputReads; private long totalDiskUsage; private String queueBacklog; private String id; @@ -288,7 +288,7 @@ public class Cluster extends Thread { MAX_SAMPLE_SIZE); private CircularFifoBuffer garbageCollectionSamples = new CircularFifoBuffer( MAX_SAMPLE_SIZE); - private Long previousJVMPauseCount = 0L; + private long previousJVMPauseCount = 0L; private Cluster.GatewayReceiver gatewayReceiver = null; private List gatewaySenderList = new ArrayList(); @@ -407,19 +407,19 @@ public class Cluster extends Thread { this.memberPort = memberPort; } - public float getThroughputWrites() { + public double getThroughputWrites() { return this.throughputWrites; } - public void setThroughputWrites(float throughputWrites) { + public void setThroughputWrites(double throughputWrites) { this.throughputWrites = throughputWrites; } - public float getThroughputReads() { + public double getThroughputReads() { return this.throughputReads; } - public void setThroughputReads(float throughputReads) { + public void setThroughputReads(double throughputReads) { this.throughputReads = throughputReads; } @@ -439,7 +439,7 @@ public class Cluster extends Thread { return this.name; } - public Double getLoadAverage() { + public double getLoadAverage() { return this.loadAverage; } @@ -459,7 +459,7 @@ public class Cluster extends Thread { return null; } - public Long getUptime() { + public long getUptime() { return this.uptime; } @@ -543,7 +543,7 @@ public class Cluster extends Thread { this.bindAddress = bindAddress; } - public void setUptime(Long uptime) { + public void setUptime(long uptime) { this.uptime = uptime; } @@ -567,35 +567,35 @@ public class Cluster extends Thread { this.totalBytesOnDisk = totalBytesOnDisk; } - public Float getCpuUsage() { + public double getCpuUsage() { return this.cpuUsage; } - public void setCpuUsage(Float cpuUsage) { + public void setCpuUsage(double cpuUsage) { this.cpuUsage = cpuUsage; } - public Float getHostCpuUsage() { + public double getHostCpuUsage() { return this.hostCpuUsage; } - public void setHostCpuUsage(Float hostCpuUsage) { + public void setHostCpuUsage(double hostCpuUsage) { this.hostCpuUsage = hostCpuUsage; } - public float getGetsRate() { + public double getGetsRate() { return this.getsRate; } - public void setGetsRate(float getsRate) { + public void setGetsRate(double getsRate) { this.getsRate = getsRate; } - public float getPutsRate() { + public double getPutsRate() { return this.putsRate; } - public void setPutsRate(float putsRate) { + public void setPutsRate(double putsRate) { this.putsRate = putsRate; } @@ -632,19 +632,19 @@ public class Cluster extends Thread { this.numThreads = numThreads; } - public Long getTotalFileDescriptorOpen() { + public long getTotalFileDescriptorOpen() { return this.totalFileDescriptorOpen; } - public void setTotalFileDescriptorOpen(Long totalFileDescriptorOpen) { + public void setTotalFileDescriptorOpen(long totalFileDescriptorOpen) { this.totalFileDescriptorOpen = totalFileDescriptorOpen; } - public Long getGarbageCollectionCount() { + public long getGarbageCollectionCount() { return this.garbageCollectionCount; } - public void setGarbageCollectionCount(Long garbageCollectionCount) { + public void setGarbageCollectionCount(long garbageCollectionCount) { this.garbageCollectionCount = garbageCollectionCount; } @@ -773,11 +773,11 @@ public class Cluster extends Thread { this.garbageCollectionSamples = garbageCollectionSamples; } - public Long getPreviousJVMPauseCount() { + public long getPreviousJVMPauseCount() { return this.previousJVMPauseCount; } - public void setPreviousJVMPauseCount(Long previousJVMPauseCount) { + public void setPreviousJVMPauseCount(long previousJVMPauseCount) { this.previousJVMPauseCount = previousJVMPauseCount; } @@ -825,10 +825,10 @@ public class Cluster extends Thread { long currCPUTime = 0; currCPUTime = updatedClient.getProcessCpuTime(); - float newCPUTime = (float) (currCPUTime - lastCPUTime) + double newCPUTime = (double) (currCPUTime - lastCPUTime) / (elapsedTime * 1000000000); - float newCPUUsage = 0; + double newCPUUsage = 0; int availableCpus = updatedClient.getCpus(); if (availableCpus > 0) { newCPUUsage = newCPUTime / availableCpus; @@ -1261,10 +1261,10 @@ public class Cluster extends Thread { private String memberName; private long entrySize; private long entryCount; - private float getsRate; - private float putsRate; - private float diskGetsRate; - private float diskPutsRate; + private double getsRate; + private double putsRate; + private double diskGetsRate; + private double diskPutsRate; private int localMaxMemory; private CircularFifoBuffer getsPerSecTrend = new CircularFifoBuffer( @@ -1307,56 +1307,56 @@ public class Cluster extends Thread { /** * @return the putsRate */ - public float getPutsRate() { + public double getPutsRate() { return putsRate; } /** * @param putsRate the putsRate to set */ - public void setPutsRate(float putsRate) { + public void setPutsRate(double putsRate) { this.putsRate = putsRate; } /** * @return the getsRate */ - public float getGetsRate() { + public double getGetsRate() { return getsRate; } /** * @param getsRate the getsRate to set */ - public void setGetsRate(float getsRate) { + public void setGetsRate(double getsRate) { this.getsRate = getsRate; } /** * @return the diskGetsRate */ - public float getDiskGetsRate() { + public double getDiskGetsRate() { return diskGetsRate; } /** * @param diskGetsRate the diskGetsRate to set */ - public void setDiskGetsRate(float diskGetsRate) { + public void setDiskGetsRate(double diskGetsRate) { this.diskGetsRate = diskGetsRate; } /** * @return the diskPutsRate */ - public float getDiskPutsRate() { + public double getDiskPutsRate() { return diskPutsRate; } /** * @param diskPutsRate the diskPutsRate to set */ - public void setDiskPutsRate(float diskPutsRate) { + public void setDiskPutsRate(double diskPutsRate) { this.diskPutsRate = diskPutsRate; } @@ -1500,11 +1500,11 @@ public class Cluster extends Thread { public static class Region { // start: fields defined in MBean private String fullPath; - private float diskReadsRate; - private float diskWritesRate; - private float getsRate; - private float putsRate; - private float lruEvictionRate; + private double diskReadsRate; + private double diskWritesRate; + private double getsRate; + private double putsRate; + private double lruEvictionRate; private String regionType; private long systemRegionEntryCount; private int memberCount; @@ -1659,19 +1659,19 @@ public class Cluster extends Thread { this.fullPath = fullPath; } - public float getDiskReadsRate() { + public double getDiskReadsRate() { return this.diskReadsRate; } - public void setDiskReadsRate(float diskReadsRate) { + public void setDiskReadsRate(double diskReadsRate) { this.diskReadsRate = diskReadsRate; } - public float getDiskWritesRate() { + public double getDiskWritesRate() { return this.diskWritesRate; } - public void setDiskWritesRate(float diskWritesRate) { + public void setDiskWritesRate(double diskWritesRate) { this.diskWritesRate = diskWritesRate; } @@ -1692,19 +1692,19 @@ public class Cluster extends Thread { this.diskWritesPerSecTrend = diskWritesPerSecTrend; } - public float getGetsRate() { + public double getGetsRate() { return this.getsRate; } - public void setGetsRate(float getsRate) { + public void setGetsRate(double getsRate) { this.getsRate = getsRate; } - public float getLruEvictionRate() { + public double getLruEvictionRate() { return this.lruEvictionRate; } - public void setLruEvictionRate(float lruEvictionRate) { + public void setLruEvictionRate(double lruEvictionRate) { this.lruEvictionRate = lruEvictionRate; } @@ -1732,11 +1732,11 @@ public class Cluster extends Thread { this.memberCount = memberCount; } - public float getPutsRate() { + public double getPutsRate() { return this.putsRate; } - public void setPutsRate(float putsRate) { + public void setPutsRate(double putsRate) { this.putsRate = putsRate; } @@ -1907,7 +1907,7 @@ public class Cluster extends Thread { private String name; private String host; private int queueSize; - private float cpuUsage; + private double cpuUsage; private long uptime; private int threads; private int gets; @@ -1975,11 +1975,11 @@ public class Cluster extends Thread { this.queueSize = queueSize; } - public float getCpuUsage() { + public double getCpuUsage() { return this.cpuUsage; } - public void setCpuUsage(float cpuUsage) { + public void setCpuUsage(double cpuUsage) { this.cpuUsage = cpuUsage; } @@ -2050,8 +2050,8 @@ public class Cluster extends Thread { public static class GatewayReceiver { private int listeningPort; - private Float linkThroughput; - private Long avgBatchProcessingTime; + private double linkThroughput; + private long avgBatchProcessingTime; private String id; private int queueSize; private Boolean status; @@ -2065,19 +2065,19 @@ public class Cluster extends Thread { this.listeningPort = listeningPort; } - public Float getLinkThroughput() { + public double getLinkThroughput() { return this.linkThroughput; } - public void setLinkThroughput(Float linkThroughput) { + public void setLinkThroughput(double linkThroughput) { this.linkThroughput = linkThroughput; } - public Long getAvgBatchProcessingTime() { + public long getAvgBatchProcessingTime() { return this.avgBatchProcessingTime; } - public void setAvgBatchProcessingTime(Long avgBatchProcessingTime) { + public void setAvgBatchProcessingTime(long avgBatchProcessingTime) { this.avgBatchProcessingTime = avgBatchProcessingTime; } @@ -2122,7 +2122,7 @@ public class Cluster extends Thread { */ public static class GatewaySender { - private Float linkThroughput; + private double linkThroughput; private String id; private int queueSize; private Boolean status; @@ -2133,11 +2133,11 @@ public class Cluster extends Thread { private int remoteDSId; private int eventsExceedingAlertThreshold; - public Float getLinkThroughput() { + public double getLinkThroughput() { return this.linkThroughput; } - public void setLinkThroughput(Float linkThroughput) { + public void setLinkThroughput(double linkThroughput) { this.linkThroughput = linkThroughput; } @@ -2505,35 +2505,35 @@ public class Cluster extends Thread { return this.stale; } - public float getWritePerSec() { + public double getWritePerSec() { return this.writePerSec; } - public void setWritePerSec(float writePerSec) { + public void setWritePerSec(double writePerSec) { this.writePerSec = writePerSec; } - public float getReadPerSec() { + public double getReadPerSec() { return this.readPerSec; } - public void setReadPerSec(float readPerSec) { + public void setReadPerSec(double readPerSec) { this.readPerSec = readPerSec; } - public float getQueriesPerSec() { + public double getQueriesPerSec() { return this.queriesPerSec; } - public void setQueriesPerSec(float queriesPerSec) { + public void setQueriesPerSec(double queriesPerSec) { this.queriesPerSec = queriesPerSec; } - public float getLoadPerSec() { + public double getLoadPerSec() { return this.loadPerSec; } - public void setLoadPerSec(float loadPerSec) { + public void setLoadPerSec(double loadPerSec) { this.loadPerSec = loadPerSec; } @@ -2557,11 +2557,11 @@ public class Cluster extends Thread { this.stopUpdates = stopUpdates; } - public Long getUsedHeapSize() { + public long getUsedHeapSize() { return this.usedHeapSize; } - public void setUsedHeapSize(Long usedHeapSize) { + public void setUsedHeapSize(long usedHeapSize) { this.usedHeapSize = usedHeapSize; } @@ -2593,7 +2593,7 @@ public class Cluster extends Thread { return this.runningFunctionCount; } - public Long getRegisteredCQCount() { + public long getRegisteredCQCount() { return this.registeredCQCount; } @@ -2605,7 +2605,7 @@ public class Cluster extends Thread { this.subscriptionCount = subscriptionCount; } - public void setRegisteredCQCount(Long registeredCQCount) { + public void setRegisteredCQCount(long registeredCQCount) { this.registeredCQCount = registeredCQCount; } @@ -2725,19 +2725,19 @@ public class Cluster extends Thread { this.totalRegionCount = totalRegionCount; } - public Long getTotalHeapSize() { + public long getTotalHeapSize() { return this.totalHeapSize; } - public void setTotalHeapSize(Long totalHeapSize) { + public void setTotalHeapSize(long totalHeapSize) { this.totalHeapSize = totalHeapSize; } - public Long getTotalRegionEntryCount() { + public long getTotalRegionEntryCount() { return this.totalRegionEntryCount; } - public void setTotalRegionEntryCount(Long totalRegionEntryCount) { + public void setTotalRegionEntryCount(long totalRegionEntryCount) { this.totalRegionEntryCount = totalRegionEntryCount; } @@ -2749,27 +2749,27 @@ public class Cluster extends Thread { this.currentQueryCount = currentQueryCount; } - public Long getTotalBytesOnDisk() { + public long getTotalBytesOnDisk() { return this.totalBytesOnDisk; } - public void setTotalBytesOnDisk(Long totalBytesOnDisk) { + public void setTotalBytesOnDisk(long totalBytesOnDisk) { this.totalBytesOnDisk = totalBytesOnDisk; } - public float getDiskReadsRate() { + public double getDiskReadsRate() { return this.diskReadsRate; } - public void setDiskReadsRate(float diskReadsRate) { + public void setDiskReadsRate(double diskReadsRate) { this.diskReadsRate = diskReadsRate; } - public float getDiskWritesRate() { + public double getDiskWritesRate() { return this.diskWritesRate; } - public void setDiskWritesRate(float diskWritesRate) { + public void setDiskWritesRate(double diskWritesRate) { this.diskWritesRate = diskWritesRate; } @@ -2797,11 +2797,11 @@ public class Cluster extends Thread { this.writePerSecTrend = writePerSecTrend; } - public Long getGarbageCollectionCount() { + public long getGarbageCollectionCount() { return this.garbageCollectionCount; } - public void setGarbageCollectionCount(Long garbageCollectionCount) { + public void setGarbageCollectionCount(long garbageCollectionCount) { this.garbageCollectionCount = garbageCollectionCount; } @@ -2862,11 +2862,11 @@ public class Cluster extends Thread { this.garbageCollectionTrend = garbageCollectionSamples; } - public Long getPreviousJVMPauseCount() { + public long getPreviousJVMPauseCount() { return this.previousJVMPauseCount; } - public void setPreviousJVMPauseCount(Long previousJVMPauseCount) { + public void setPreviousJVMPauseCount(long previousJVMPauseCount) { this.previousJVMPauseCount = previousJVMPauseCount; } @@ -3301,7 +3301,7 @@ public class Cluster extends Thread { m.gatewayReceiver = new Cluster.GatewayReceiver(); } m.gatewayReceiver.listeningPort = Integer.parseInt(port); - m.gatewayReceiver.linkThroughput = (float) Math.abs(r.nextInt(10)); + m.gatewayReceiver.linkThroughput = Math.abs(r.nextInt(10)); m.gatewayReceiver.avgBatchProcessingTime = (long) Math.abs(r.nextInt(10)); m.gatewayReceiver.id = String.valueOf(Math.abs(r.nextInt(10))); m.gatewayReceiver.queueSize = Math.abs(r.nextInt(10)); @@ -3353,7 +3353,7 @@ public class Cluster extends Thread { gatewaySender.batchSize = Math.abs(r.nextInt(10)); gatewaySender.id = String.valueOf(Math.abs(r.nextInt(10))); - gatewaySender.linkThroughput = (float) Math.abs(r.nextInt(10)); + gatewaySender.linkThroughput = Math.abs(r.nextInt(10)); gatewaySender.persistenceEnabled = true; gatewaySender.primary = true; gatewaySender.queueSize = Math.abs(r.nextInt(10)); @@ -3418,10 +3418,10 @@ public class Cluster extends Thread { m.OffHeapUsedSize = Math.abs(r.nextInt(Math.abs((int) m.maxHeapSize))); m.totalDiskUsage = Math.abs(r.nextInt(100)); - Float cpuUsage = r.nextFloat() * 100; + double cpuUsage = r.nextDouble() * 100; m.cpuUsageSamples.add(cpuUsage); m.cpuUsage = cpuUsage; - m.hostCpuUsage = r.nextFloat() * 200; + m.hostCpuUsage = r.nextDouble() * 200; m.heapUsageSamples.add(m.currentHeapSize); m.loadAverage = (double) Math.abs(r.nextInt(100)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java index adb7532..71dfa61 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java @@ -721,13 +721,13 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { cluster.getTotalBytesOnDiskTrend().add(cluster.getTotalBytesOnDisk()); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKWRITESRATE: - cluster.setDiskWritesRate(getFloatAttribute(attribute.getValue(), + cluster.setDiskWritesRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); cluster.getThroughoutWritesTrend().add(cluster.getDiskWritesRate()); break; case PulseConstants.MBEAN_ATTRIBUTE_AVERAGEWRITES: try { - cluster.setWritePerSec(getFloatAttribute(attribute.getValue(), + cluster.setWritePerSec(getDoubleAttribute(attribute.getValue(), attribute.getName())); } catch (Exception e) { cluster.setWritePerSec(0); @@ -737,7 +737,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { break; case PulseConstants.MBEAN_ATTRIBUTE_AVERAGEREADS: try { - cluster.setReadPerSec(getFloatAttribute(attribute.getValue(), + cluster.setReadPerSec(getDoubleAttribute(attribute.getValue(), attribute.getName())); } catch (Exception e) { cluster.setReadPerSec(0); @@ -746,12 +746,12 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { cluster.getReadPerSecTrend().add(cluster.getReadPerSec()); break; case PulseConstants.MBEAN_ATTRIBUTE_QUERYREQUESTRATE: - cluster.setQueriesPerSec(getFloatAttribute(attribute.getValue(), + cluster.setQueriesPerSec(getDoubleAttribute(attribute.getValue(), attribute.getName())); cluster.getQueriesPerSecTrend().add(cluster.getQueriesPerSec()); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKREADSRATE: - cluster.setDiskReadsRate(getFloatAttribute(attribute.getValue(), + cluster.setDiskReadsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); cluster.getThroughoutReadsTrend().add(cluster.getDiskReadsRate()); break; @@ -870,7 +870,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getValue(), attribute.getName())); } else if (attribute.getName().equals( PulseConstants.MBEAN_ATTRIBUTE_EVENTRECEIVEDDATE)) { - gatewayReceiver.setLinkThroughput(getFloatAttribute( + gatewayReceiver.setLinkThroughput(getDoubleAttribute( attribute.getValue(), attribute.getName())); } else if (attribute.getName().equals( PulseConstants.MBEAN_ATTRIBUTE_AVEARGEBATCHPROCESSINGTIME)) { @@ -912,7 +912,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { String name = attribute.getName(); switch (name){ case PulseConstants.MBEAN_ATTRIBUTE_EVENTRECEIVEDDATE: - gatewaySender.setLinkThroughput(getFloatAttribute(attribute.getValue(), + gatewaySender.setLinkThroughput(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_BATCHSIZE: @@ -1292,22 +1292,22 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { LOGGER.fine("updateRegionOnMembers : anRom.getEntryCount() = " + anRom.getEntryCount()); break; case PulseConstants.MBEAN_ATTRIBUTE_PUTSRATE: - anRom.setPutsRate(getFloatAttribute(attribute.getValue(), + anRom.setPutsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); LOGGER.fine("updateRegionOnMembers : anRom.getPutsRate() = " + anRom.getPutsRate()); break; case PulseConstants.MBEAN_ATTRIBUTE_GETSRATE: - anRom.setGetsRate(getFloatAttribute(attribute.getValue(), + anRom.setGetsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); LOGGER.fine("updateRegionOnMembers : anRom.getGetsRate() = " + anRom.getGetsRate()); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKREADSRATE: - anRom.setDiskGetsRate(getFloatAttribute(attribute.getValue(), + anRom.setDiskGetsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); LOGGER.fine("updateRegionOnMembers : anRom.getDiskGetsRate() = " + anRom.getDiskGetsRate()); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKWRITESRATE: - anRom.setDiskPutsRate(getFloatAttribute(attribute.getValue(), + anRom.setDiskPutsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); LOGGER.fine("updateRegionOnMembers : anRom.getDiskPutsRate() = " + anRom.getDiskPutsRate()); break; @@ -1358,19 +1358,19 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_PUTSRATE: - regionOnMember.setPutsRate(getFloatAttribute(attribute.getValue(), + regionOnMember.setPutsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_GETSRATE: - regionOnMember.setGetsRate(getFloatAttribute(attribute.getValue(), + regionOnMember.setGetsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKREADSRATE: - regionOnMember.setDiskGetsRate(getFloatAttribute(attribute.getValue(), + regionOnMember.setDiskGetsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKWRITESRATE: - regionOnMember.setDiskPutsRate(getFloatAttribute(attribute.getValue(), + regionOnMember.setDiskPutsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_LOCALMAXMEMORY: @@ -1454,11 +1454,11 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKREADSRATE: - region.setDiskReadsRate(getFloatAttribute(attribute.getValue(), + region.setDiskReadsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKWRITESRATE: - region.setDiskWritesRate(getFloatAttribute(attribute.getValue(), + region.setDiskWritesRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_EMPTYNODES: @@ -1466,15 +1466,15 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_GETSRATE: - region.setGetsRate(getFloatAttribute(attribute.getValue(), + region.setGetsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_LRUEVICTIONRATE: - region.setLruEvictionRate(getFloatAttribute(attribute.getValue(), + region.setLruEvictionRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_PUTSRATE: - region.setPutsRate(getFloatAttribute(attribute.getValue(), + region.setPutsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_REGIONTYPE: @@ -1784,12 +1784,12 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKWRITESRATE: - member.setThroughputWrites(getFloatAttribute(attribute.getValue(), + member.setThroughputWrites(getDoubleAttribute(attribute.getValue(), attribute.getName())); member.getThroughputWritesTrend().add(member.getThroughputWrites()); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKREADSRATE: - member.setThroughputReads(getFloatAttribute(attribute.getValue(), + member.setThroughputReads(getDoubleAttribute(attribute.getValue(), attribute.getName())); member.getThroughputReadsTrend().add(member.getThroughputReads()); break; @@ -1837,14 +1837,14 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { member.getTotalBytesOnDiskSamples().add(member.getTotalBytesOnDisk()); break; case PulseConstants.MBEAN_ATTRIBUTE_CPUUSAGE: - member.setCpuUsage(getFloatAttribute(attribute.getValue(), + member.setCpuUsage(getDoubleAttribute(attribute.getValue(), attribute.getName())); member.getCpuUsageSamples().add(member.getCpuUsage()); break; case PulseConstants.MBEAN_ATTRIBUTE_HOSTCPUUSAGE: // Float value is expected for host cpu usage. // TODO Remove Float.valueOf() when float value is provided in mbean - member.setHostCpuUsage(Float.valueOf(getIntegerAttribute( + member.setHostCpuUsage(Double.valueOf(getIntegerAttribute( attribute.getValue(), attribute.getName()))); break; case PulseConstants.MBEAN_ATTRIBUTE_MEMBER: @@ -1856,12 +1856,12 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_AVERAGEREADS: - member.setGetsRate(getFloatAttribute(attribute.getValue(), + member.setGetsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); member.getGetsPerSecond().add(member.getGetsRate()); break; case PulseConstants.MBEAN_ATTRIBUTE_AVERAGEWRITES: - member.setPutsRate(getFloatAttribute(attribute.getValue(), + member.setPutsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); member.getPutsPerSecond().add(member.getPutsRate()); break; @@ -2225,23 +2225,23 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKREADSRATE: - region.setDiskReadsRate(getFloatAttribute(attribute.getValue(), + region.setDiskReadsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_DISKWRITESRATE: - region.setDiskWritesRate(getFloatAttribute(attribute.getValue(), + region.setDiskWritesRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_GETSRATE: - region.setGetsRate(getFloatAttribute(attribute.getValue(), + region.setGetsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_LRUEVICTIONRATE: - region.setLruEvictionRate(getFloatAttribute(attribute.getValue(), + region.setLruEvictionRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_PUTSRATE: - region.setPutsRate(getFloatAttribute(attribute.getValue(), + region.setPutsRate(getDoubleAttribute(attribute.getValue(), attribute.getName())); break; case PulseConstants.MBEAN_ATTRIBUTE_REGIONTYPE: http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java index 576f0a3..0b05001 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java @@ -55,8 +55,8 @@ public class ClusterDiskThroughputService implements PulseService { // cluster's Throughout Writes trend added to json response object // CircularFifoBuffer throughoutWritesTrend = // cluster.getThroughoutWritesTrend(); - Float currentThroughputWrites = cluster.getDiskWritesRate(); - Float currentThroughputReads = cluster.getDiskReadsRate(); + double currentThroughputWrites = cluster.getDiskWritesRate(); + double currentThroughputReads = cluster.getDiskReadsRate(); responseJSON.put("currentThroughputReads", currentThroughputReads); responseJSON.put("throughputReads", http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java index a9c9d03..263f229 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java @@ -58,7 +58,9 @@ public class ClusterGCPausesService implements PulseService { ArrayNode pauses = mapper.createArrayNode(); for (Object obj : cluster.getStatisticTrend(Cluster.CLUSTER_STAT_GARBAGE_COLLECTION)) { - pauses.add(obj.toString()); + if (obj instanceof Number) { + pauses.add(((Number) obj).longValue()); + } } responseJSON.put("currentGCPauses", cluster.getGarbageCollectionCount()); responseJSON.put("gCPausesTrend", pauses); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java index 882366d..4b535cb 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java @@ -89,25 +89,22 @@ public class ClusterMemberService implements PulseService { } memberJSON.put("redundancyZones", mapper.valueToTree(redundancyZones)); - DecimalFormat df2 = new DecimalFormat( - PulseConstants.DECIMAL_FORMAT_PATTERN); + DecimalFormat df2 = new DecimalFormat(PulseConstants.DECIMAL_FORMAT_PATTERN); long usedHeapSize = cluster.getUsedHeapSize(); long currentHeap = clusterMember.getCurrentHeapSize(); if (usedHeapSize > 0) { - float heapUsage = ((float) currentHeap / (float) usedHeapSize) * 100; - memberJSON - .put(this.HEAP_USAGE, Double.valueOf(df2.format(heapUsage))); + double heapUsage = ((double) currentHeap / (double) usedHeapSize) * 100; + memberJSON.put(this.HEAP_USAGE, Double.valueOf(df2.format(heapUsage))); } else { memberJSON.put(this.HEAP_USAGE, 0); } - Float currentCPUUsage = clusterMember.getCpuUsage(); + double currentCPUUsage = clusterMember.getCpuUsage(); - memberJSON.put("cpuUsage", Float.valueOf(df2.format(currentCPUUsage))); + memberJSON.put("cpuUsage", df2.format(currentCPUUsage)); memberJSON.put("currentHeapUsage", clusterMember.getCurrentHeapSize()); memberJSON.put("isManager", clusterMember.isManager()); - memberJSON.put("uptime", - TimeUtils.convertTimeSecondsToHMS(clusterMember.getUptime())); + memberJSON.put("uptime", TimeUtils.convertTimeSecondsToHMS(clusterMember.getUptime())); memberJSON.put("loadAvg", clusterMember.getLoadAverage()); memberJSON.put("sockets", clusterMember.getTotalFileDescriptorOpen()); memberJSON.put("threads", clusterMember.getNumThreads()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java index f560b91..44296cb 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java @@ -133,11 +133,11 @@ public class ClusterMembersRGraphService implements PulseService { for (Map.Entry> physicalToMem : physicalToMember.entrySet()) { String hostName = physicalToMem.getKey(); - Float hostCpuUsage = 0.0F; - Long hostMemoryUsage = (long) 0; - Double hostLoadAvg = 0.0; + double hostCpuUsage = 0.0; + long hostMemoryUsage = 0; + double hostLoadAvg = 0.0; int hostNumThreads = 0; - Long hostSockets = (long) 0; + long hostSockets = 0; boolean hostSevere = false; boolean hostError = false; boolean hostWarning = false; @@ -163,18 +163,17 @@ public class ClusterMembersRGraphService implements PulseService { Long usedHeapSize = cluster.getUsedHeapSize(); if (usedHeapSize > 0) { - float heapUsage = (currentHeap.floatValue() / usedHeapSize - .floatValue()) * 100; + double heapUsage = (currentHeap.doubleValue() / usedHeapSize.doubleValue()) * 100; memberData.put(this.MEMORY_USAGE, Double.valueOf(df2.format(heapUsage))); } else memberData.put(this.MEMORY_USAGE, 0); - Float currentCPUUsage = member.getCpuUsage(); + double currentCPUUsage = member.getCpuUsage(); memberData.put(this.CPU_USAGE, - Float.valueOf(df2.format(currentCPUUsage))); + Double.valueOf(df2.format(currentCPUUsage))); memberData.put(this.REGIONS, member.getMemberRegions().size()); memberData.put(this.HOST, member.getHost()); if ((member.getMemberPort() == null) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java index 3e54c36..ca8cd73 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java @@ -86,6 +86,7 @@ public class ClusterRegionService implements PulseService { responseJSON.put("clusterName", cluster.getServerName()); responseJSON.put("userName", userName); responseJSON.put("region", getRegionJson(cluster)); + // Send json response return responseJSON; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java index 72640d4..4309c40 100644 --- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java +++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java @@ -155,14 +155,14 @@ public class ClusterSelectedRegionService implements PulseService { long usedHeapSize = cluster.getUsedHeapSize(); long currentHeap = member.getCurrentHeapSize(); if (usedHeapSize > 0) { - float heapUsage = ((float) currentHeap / (float) usedHeapSize) * 100; + double heapUsage = ((double) currentHeap / (double) usedHeapSize) * 100; regionMember.put("heapUsage", Double.valueOf(df2.format(heapUsage))); } else { regionMember.put("heapUsage", 0); } - Float currentCPUUsage = member.getCpuUsage(); + double currentCPUUsage = member.getCpuUsage(); - regionMember.put("cpuUsage", Float.valueOf(df2.format(currentCPUUsage))); + regionMember.put("cpuUsage", Double.valueOf(df2.format(currentCPUUsage))); regionMember.put("currentHeapUsage", member.getCurrentHeapSize()); regionMember.put("isManager", member.isManager()); regionMember.put("uptime", TimeUtils.convertTimeSecondsToHMS(member.getUptime())); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java index 33e0a1c..664126d 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java @@ -3,13 +3,13 @@ package com.vmware.gemfire.tools.pulse.controllers; import com.fasterxml.jackson.databind.ObjectMapper; import com.gemstone.gemfire.test.junit.categories.UnitTest; import com.vmware.gemfire.tools.pulse.internal.PulseAppListener; +import com.vmware.gemfire.tools.pulse.internal.ServiceConfiguration; import com.vmware.gemfire.tools.pulse.internal.controllers.PulseController; import com.vmware.gemfire.tools.pulse.internal.data.Cluster; import com.vmware.gemfire.tools.pulse.internal.data.PulseConfig; import com.vmware.gemfire.tools.pulse.internal.data.Repository; import org.apache.commons.collections.buffer.CircularFifoBuffer; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -107,6 +107,8 @@ public class PulseControllerJUnitTest { region.setMemberName(new ArrayList() {{ add(MEMBER_NAME); }}); + region.setPutsRate(12.31D); + region.setGetsRate(27.99D); Cluster.RegionOnMember regionOnMember = new Cluster.RegionOnMember(); regionOnMember.setRegionFullPath(REGION_PATH); regionOnMember.setMemberName(MEMBER_NAME); @@ -121,6 +123,7 @@ public class PulseControllerJUnitTest { member.setUptime(1L); member.setHost(PHYSICAL_HOST_NAME); member.setGemfireVersion(GEMFIRE_VERSION); + member.setCpuUsage(55.77D); member.setMemberRegions(new HashMap() {{ put(REGION_NAME, region); @@ -155,9 +158,9 @@ public class PulseControllerJUnitTest { add(3); }}); cluster.setWritePerSecTrend(new CircularFifoBuffer() {{ - add(1); - add(2); - add(3); + add(1.29); + add(2.3); + add(3.0); }}); cluster.setThroughoutReadsTrend(new CircularFifoBuffer() {{ add(1); @@ -238,7 +241,7 @@ public class PulseControllerJUnitTest { .andExpect(status().isOk()) .andExpect(jsonPath("$.ClusterKeyStatistics.readPerSecTrend").isEmpty()) .andExpect(jsonPath("$.ClusterKeyStatistics.queriesPerSecTrend").isEmpty()) - .andExpect(jsonPath("$.ClusterKeyStatistics.writePerSecTrend", contains(1, 2, 3))) + .andExpect(jsonPath("$.ClusterKeyStatistics.writePerSecTrend", contains(1.29, 2.3, 3.0))) ; } @@ -250,7 +253,7 @@ public class PulseControllerJUnitTest { .accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE))) .andExpect(status().isOk()) .andExpect(jsonPath("$.ClusterMembers.members[0].serverGroups[0]").value("Default")) - .andExpect(jsonPath("$.ClusterMembers.members[0].cpuUsage").value(0D)) + .andExpect(jsonPath("$.ClusterMembers.members[0].cpuUsage").value(55.77D)) .andExpect(jsonPath("$.ClusterMembers.members[0].clients").value(1)) .andExpect(jsonPath("$.ClusterMembers.members[0].heapUsage").value(0)) .andExpect(jsonPath("$.ClusterMembers.members[0].name").value(MEMBER_NAME)) @@ -275,8 +278,8 @@ public class PulseControllerJUnitTest { .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.id").value(0)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].id").value(PHYSICAL_HOST_NAME)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].name").value(PHYSICAL_HOST_NAME)) - .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].data.loadAvg").isEmpty()) - .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].data.sockets").isEmpty()) + .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].data.loadAvg").value(0D)) + .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].data.sockets").value(0)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].data.threads").value(0)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].data.cpuUsage").value(0D)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].data.memoryUsage").value(0)) @@ -286,7 +289,7 @@ public class PulseControllerJUnitTest { .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].name").value(MEMBER_NAME)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].data.gemfireVersion").value(GEMFIRE_VERSION)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].data.memoryUsage").value(0)) - .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].data.cpuUsage").value(0D)) + .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].data.cpuUsage").value(55.77D)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].data.regions").value(1)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].data.host").value(PHYSICAL_HOST_NAME)) .andExpect(jsonPath("$.ClusterMembersRGraph.clustor.children[0].children[0].data.port").value("-")) @@ -325,7 +328,7 @@ public class PulseControllerJUnitTest { .andExpect(jsonPath("$.ClusterRegion.region[0].regionPath").value(REGION_PATH)) .andExpect(jsonPath("$.ClusterRegion.region[0].diskReadsTrend").isEmpty()) .andExpect(jsonPath("$.ClusterRegion.region[0].memoryUsage").value("0.0000")) - .andExpect(jsonPath("$.ClusterRegion.region[0].getsRate").value(0D)) + .andExpect(jsonPath("$.ClusterRegion.region[0].getsRate").value(27.99D)) .andExpect(jsonPath("$.ClusterRegion.region[0].wanEnabled").value(false)) .andExpect(jsonPath("$.ClusterRegion.region[0].memberCount").value(1)) .andExpect(jsonPath("$.ClusterRegion.region[0].isHDFSWriteOnly").value("NA")) @@ -334,7 +337,7 @@ public class PulseControllerJUnitTest { .andExpect(jsonPath("$.ClusterRegion.region[0].emptyNodes").value(0)) .andExpect(jsonPath("$.ClusterRegion.region[0].type").value(REGION_TYPE)) .andExpect(jsonPath("$.ClusterRegion.region[0].isEnableOffHeapMemory").value("OFF")) - .andExpect(jsonPath("$.ClusterRegion.region[0].putsRate").value(0D)) + .andExpect(jsonPath("$.ClusterRegion.region[0].putsRate").value(12.31D)) .andExpect(jsonPath("$.ClusterRegion.region[0].totalMemory").value(0)) .andExpect(jsonPath("$.ClusterRegion.region[0].entryCount").value(0)) .andExpect(jsonPath("$.ClusterRegion.region[0].compressionCodec").value("NA")) @@ -359,7 +362,7 @@ public class PulseControllerJUnitTest { .andExpect(jsonPath("$.ClusterRegions.regions[0].regionPath").value(REGION_PATH)) .andExpect(jsonPath("$.ClusterRegions.regions[0].diskReadsTrend").isEmpty()) .andExpect(jsonPath("$.ClusterRegions.regions[0].memoryUsage").value("0.0000")) - .andExpect(jsonPath("$.ClusterRegions.regions[0].getsRate").value(0D)) + .andExpect(jsonPath("$.ClusterRegions.regions[0].getsRate").value(27.99D)) .andExpect(jsonPath("$.ClusterRegions.regions[0].wanEnabled").value(false)) .andExpect(jsonPath("$.ClusterRegions.regions[0].memberCount").value(1)) .andExpect(jsonPath("$.ClusterRegions.regions[0].isHDFSWriteOnly").value("NA")) @@ -368,7 +371,7 @@ public class PulseControllerJUnitTest { .andExpect(jsonPath("$.ClusterRegions.regions[0].emptyNodes").value(0)) .andExpect(jsonPath("$.ClusterRegions.regions[0].type").value(REGION_TYPE)) .andExpect(jsonPath("$.ClusterRegions.regions[0].isEnableOffHeapMemory").value("OFF")) - .andExpect(jsonPath("$.ClusterRegions.regions[0].putsRate").value(0D)) + .andExpect(jsonPath("$.ClusterRegions.regions[0].putsRate").value(12.31D)) .andExpect(jsonPath("$.ClusterRegions.regions[0].totalMemory").value(0)) .andExpect(jsonPath("$.ClusterRegions.regions[0].entryCount").value(0)) .andExpect(jsonPath("$.ClusterRegions.regions[0].compressionCodec").value("NA")) @@ -391,12 +394,12 @@ public class PulseControllerJUnitTest { .accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE))) .andExpect(status().isOk()) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.lruEvictionRate").value(0D)) - .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.getsRate").value(0D)) + .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.getsRate").value(27.99D)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.emptyNodes").value(0)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.type").value(REGION_TYPE)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.isEnableOffHeapMemory").value("OFF")) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.path").value(REGION_PATH)) - .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.members[0].cpuUsage").value(0D)) + .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.members[0].cpuUsage").value(55.77D)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.members[0].clients").value(1)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.members[0].heapUsage").value(0)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.members[0].name").value(MEMBER_NAME)) @@ -414,7 +417,7 @@ public class PulseControllerJUnitTest { .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.wanEnabled").value(false)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.memberCount").value(1)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.isHDFSWriteOnly").value("NA")) - .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.putsRate").value(0D)) + .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.putsRate").value(12.31D)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.totalMemory").value(0)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.entryCount").value(0)) .andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.compressionCodec").value("NA")) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/PropMockDataUpdater.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/PropMockDataUpdater.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/PropMockDataUpdater.java index 51cc279..ee530d2 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/PropMockDataUpdater.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/PropMockDataUpdater.java @@ -89,7 +89,7 @@ public class PropMockDataUpdater implements IClusterUpdater { cluster.setTotalHeapSize(totalHeapSize); long usedHeapSize = Math.abs(r.nextInt(2048)); cluster.setUsedHeapSize(usedHeapSize); - float writePerSec = Math.abs(r.nextInt(100)); + double writePerSec = Math.abs(r.nextInt(100)); cluster.setWritePerSec(writePerSec); //propfile @@ -342,7 +342,7 @@ public class PropMockDataUpdater implements IClusterUpdater { if(port==null || "".equals(port)) port = "1099"; gatewayReceiver.setListeningPort(Integer.parseInt(port)); - gatewayReceiver.setLinkThroughput((float) Math.abs(r.nextInt(10))); + gatewayReceiver.setLinkThroughput(Math.abs(r.nextInt(10))); gatewayReceiver.setAvgBatchProcessingTime((long) Math.abs(r.nextInt(10))); gatewayReceiver.setId(String.valueOf(Math.abs(r.nextInt(10)))); gatewayReceiver.setQueueSize(Math.abs(r.nextInt(10))); @@ -378,7 +378,7 @@ public class PropMockDataUpdater implements IClusterUpdater { gatewaySender.setBatchSize(Math.abs(r.nextInt(10))); gatewaySender.setId(String.valueOf(Math.abs(r.nextInt(10)))); - gatewaySender.setLinkThroughput((float) Math.abs(r.nextInt(10))); + gatewaySender.setLinkThroughput(Math.abs(r.nextInt(10))); gatewaySender.setPersistenceEnabled(true); gatewaySender.setPrimary(true); gatewaySender.setQueueSize(Math.abs(r.nextInt(10))); @@ -427,7 +427,7 @@ public class PropMockDataUpdater implements IClusterUpdater { m.setCurrentHeapSize(Math.abs(r.nextInt(Math.abs((int) m.getMaxHeapSize())))); m.setTotalDiskUsage(Math.abs(r.nextInt(100))); - Float cpuUsage = r.nextFloat() * 100; + double cpuUsage = r.nextDouble() * 100; m.getCpuUsageSamples().add(cpuUsage); m.setCpuUsage(cpuUsage); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java index 1649543..98e015e 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Member.java @@ -80,8 +80,8 @@ public class Member extends JMXBaseBean implements MemberMBean { } @Override - public float getDiskWritesRate() { - return getFloat("diskWritesRate"); + public double getDiskWritesRate() { + return getDouble("diskWritesRate"); } @Override @@ -132,8 +132,8 @@ public class Member extends JMXBaseBean implements MemberMBean { } @Override - public float getCpuUsage() { - return getFloat("cpuUsage"); + public double getCpuUsage() { + return getDouble("cpuUsage"); } @Override @@ -147,13 +147,13 @@ public class Member extends JMXBaseBean implements MemberMBean { } @Override - public float getAverageReads() { - return getFloat("averageReads"); + public double getAverageReads() { + return getDouble("averageReads"); } @Override - public float getAverageWrites() { - return getFloat("averageWrites"); + public double getAverageWrites() { + return getDouble("averageWrites"); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/MemberMBean.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/MemberMBean.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/MemberMBean.java index d96fb3b..f57d80f 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/MemberMBean.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/MemberMBean.java @@ -40,7 +40,7 @@ public interface MemberMBean { double getLoadAverage(); - float getDiskWritesRate(); + double getDiskWritesRate(); long getJVMPauses(); @@ -60,15 +60,15 @@ public interface MemberMBean { long getTotalBytesOnDisk(); - float getCpuUsage(); + double getCpuUsage(); String getMember(); String getId(); - float getAverageReads(); + double getAverageReads(); - float getAverageWrites(); + double getAverageWrites(); int getPort(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java index f239bb6..f82b10f 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java @@ -468,13 +468,13 @@ public class PulseBaseTest extends PulseTest { } public void assertMemberSortingByCpuUsage(){ - Map memberMap = new TreeMap(Collections.reverseOrder()); + Map memberMap = new TreeMap<>(Collections.reverseOrder()); String [] membersNames = splitString(JMXProperties.getInstance().getProperty("members"), " "); for (String member : membersNames) { Member thisMember = new Member(member); memberMap.put(thisMember.getCpuUsage(), thisMember.getMember()); } - for(Map.Entry entry : memberMap.entrySet()) { + for(Map.Entry entry : memberMap.entrySet()) { //here matching painting style to validation that the members are painted according to their cpu usage String refMemberCPUUsage = null; if(entry.getValue().equalsIgnoreCase("M1")){ @@ -510,13 +510,13 @@ public class PulseBaseTest extends PulseTest { } public void assertMemberSortingBySGCpuUsage(){ - Map memberMap = new TreeMap(Collections.reverseOrder()); + Map memberMap = new TreeMap<>(Collections.reverseOrder()); String [] membersNames = splitString(JMXProperties.getInstance().getProperty("members"), " "); for (String member : membersNames) { Member thisMember = new Member(member); memberMap.put(thisMember.getCpuUsage(), thisMember.getMember()); } - for(Map.Entry entry : memberMap.entrySet()) { + for(Map.Entry entry : memberMap.entrySet()) { //here matching painting style to validation that the members are painted according to their cpu usage String refMemberCPUUsage = null; if(entry.getValue().equalsIgnoreCase("M1")){ @@ -588,7 +588,7 @@ public class PulseBaseTest extends PulseTest { sgMembers.put(thisMember.getMember(), thisMember); } } - Map memberMap = new TreeMap(Collections.reverseOrder()); + Map memberMap = new TreeMap<>(Collections.reverseOrder()); //SG3(!)M3 for(int sgId=1; sgId<=3; sgId++){ String sgName = "SG1"; @@ -597,7 +597,7 @@ public class PulseBaseTest extends PulseTest { memberMap.put(m.getCpuUsage(), m.getMember()); } - for(Map.Entry entry : memberMap.entrySet()) { + for(Map.Entry entry : memberMap.entrySet()) { //here matching painting style to validation that the members are painted according to their cpu usage String refMemberCPUUsage = null; if(entry.getValue().equalsIgnoreCase("M1")){ @@ -661,13 +661,13 @@ public class PulseBaseTest extends PulseTest { rzMembers.put(thisMember.getMember(), thisMember); } - Map memberMap = new TreeMap(Collections.reverseOrder()); + Map memberMap = new TreeMap<>(Collections.reverseOrder()); String rzName = "RZ1 RZ2"; String memName = "M1" ; Member m = rzMap.get(rzName).get(memName); memberMap.put(m.getCpuUsage(), m.getMember()); - for(Map.Entry entry : memberMap.entrySet()) { + for(Map.Entry entry : memberMap.entrySet()) { //here matching painting style to validation that the members are painted according to their cpu usage String refMemberCPUUsage = null; if(entry.getValue().equalsIgnoreCase("M1")){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java index 00a6096..e945156 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java @@ -131,8 +131,6 @@ public class PulseTest { private static final String MEMBER_DROPDOWN_ID = "Members"; private static final String DATA_DROPDOWN_ID = "Data"; - private static WebDriver initdriver = null; - @BeforeClass public static void setUpBeforeClass() throws Exception { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Region.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Region.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Region.java index a38e572..70476f9 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Region.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Region.java @@ -72,13 +72,13 @@ public class Region extends JMXBaseBean implements RegionMBean { } @Override - public float getDiskReadsRate() { - return getFloat("diskReadsRate"); + public double getDiskReadsRate() { + return getDouble("diskReadsRate"); } @Override - public float getDiskWritesRate() { - return getFloat("diskWritesRate"); + public double getDiskWritesRate() { + return getDouble("diskWritesRate"); } @Override @@ -87,18 +87,18 @@ public class Region extends JMXBaseBean implements RegionMBean { } @Override - public float getGetsRate() { - return getFloat("getsRate"); + public double getGetsRate() { + return getDouble("getsRate"); } @Override - public float getLruEvictionRate() { - return getFloat("lruEvictionRate"); + public double getLruEvictionRate() { + return getDouble("lruEvictionRate"); } @Override - public float getPutsRate() { - return getFloat("putsRate"); + public double getPutsRate() { + return getDouble("putsRate"); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionMBean.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionMBean.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionMBean.java index b127b32..a408b94 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionMBean.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionMBean.java @@ -27,17 +27,17 @@ public interface RegionMBean { String getFullPath(); - float getDiskReadsRate(); + double getDiskReadsRate(); - float getDiskWritesRate(); + double getDiskWritesRate(); int getEmptyNodes(); - float getGetsRate(); + double getGetsRate(); - float getLruEvictionRate(); + double getLruEvictionRate(); - float getPutsRate(); + double getPutsRate(); String getRegionType(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java index 1b7d4c3..3f7051b 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMember.java @@ -70,23 +70,23 @@ public class RegionOnMember extends JMXBaseBean implements RegionOnMemberMBean { } @Override - public float getGetsRate(){ - return getFloat("getsRate"); + public double getGetsRate(){ + return getDouble("getsRate"); } @Override - public float getPutsRate(){ - return getFloat("putsRate"); + public double getPutsRate(){ + return getDouble("putsRate"); } @Override - public float getDiskReadsRate(){ - return getFloat("diskGetsRate"); + public double getDiskReadsRate(){ + return getDouble("diskGetsRate"); } @Override - public float getDiskWritesRate(){ - return getFloat("diskPutsRate"); + public double getDiskWritesRate(){ + return getDouble("diskPutsRate"); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMemberMBean.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMemberMBean.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMemberMBean.java index e67da24..a247c5d 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMemberMBean.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/RegionOnMemberMBean.java @@ -38,13 +38,13 @@ public interface RegionOnMemberMBean { long getEntryCount(); - float getGetsRate(); + double getGetsRate(); - float getPutsRate(); + double getPutsRate(); - float getDiskReadsRate(); + double getDiskReadsRate(); - float getDiskWritesRate(); + double getDiskWritesRate(); int getLocalMaxMemory(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java index 01eda38..e663d4f 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObject.java @@ -202,32 +202,35 @@ public class ServerObject extends NotificationBroadcasterSupport implements } @Override - public float getDiskWritesRate() { - return Float.parseFloat(JMXProperties.getInstance().getProperty( + public double getDiskWritesRate() { + return Double.parseDouble(JMXProperties.getInstance().getProperty( getKey("diskWritesRate"))); } @Override - public float getAverageWrites() { - return Float.parseFloat(JMXProperties.getInstance().getProperty( - getKey("averageWrites"), "")); + public double getAverageWrites() { + String val = JMXProperties.getInstance().getProperty(getKey("averageWrites"), ""); + double ret = Double.parseDouble(val); + return ret; +// return Double.parseDouble(JMXProperties.getInstance().getProperty( +// getKey("averageWrites"), "")); } @Override - public float getAverageReads() { - return Float.parseFloat(JMXProperties.getInstance().getProperty( + public double getAverageReads() { + return Double.parseDouble(JMXProperties.getInstance().getProperty( getKey("averageReads"), "")); } @Override - public float getQueryRequestRate() { - return Float.parseFloat(JMXProperties.getInstance().getProperty( + public double getQueryRequestRate() { + return Double.parseDouble(JMXProperties.getInstance().getProperty( getKey("queryRequestRate"), "")); } @Override - public float getDiskReadsRate() { - return Float.parseFloat(JMXProperties.getInstance().getProperty( + public double getDiskReadsRate() { + return Double.parseDouble(JMXProperties.getInstance().getProperty( getKey("diskReadsRate"), "")); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/022733e8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java index 19f618e..f5048eb 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/ServerObjectMBean.java @@ -59,15 +59,15 @@ public interface ServerObjectMBean { long getTotalDiskUsage(); - float getDiskWritesRate(); + double getDiskWritesRate(); - float getAverageWrites(); + double getAverageWrites(); - float getAverageReads(); + double getAverageReads(); - float getQueryRequestRate(); + double getQueryRequestRate(); - float getDiskReadsRate(); + double getDiskReadsRate(); long getJVMPauses();