You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/04/19 01:01:26 UTC
[17/17] incubator-geode git commit: Removing HDFS from pulse
Removing HDFS from pulse
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cb7398f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cb7398f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cb7398f0
Branch: refs/heads/feature/GEODE-1072
Commit: cb7398f0510c15b6fb9e6259aebede26c0228745
Parents: f0a8a55
Author: Dan Smith <up...@apache.org>
Authored: Fri Apr 15 17:24:29 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Apr 15 17:24:29 2016 -0700
----------------------------------------------------------------------
.../gemfire/tools/pulse/internal/data/Cluster.java | 9 ---------
.../tools/pulse/internal/data/PulseConstants.java | 1 -
.../pulse/internal/service/ClusterRegionService.java | 11 -----------
.../pulse/internal/service/ClusterRegionsService.java | 11 -----------
.../internal/service/ClusterSelectedRegionService.java | 6 ------
.../main/webapp/scripts/pulsescript/PulseCallbacks.js | 2 --
.../src/main/webapp/scripts/pulsescript/clusterDetail.js | 7 +------
.../pulse/controllers/PulseControllerJUnitTest.java | 3 ---
.../com/vmware/gemfire/tools/pulse/tests/Region.java | 9 ++-------
geode-pulse/src/test/resources/test.properties | 6 +++---
10 files changed, 6 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/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 dd89cdb..215b063 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
@@ -1516,7 +1516,6 @@ public class Cluster extends Thread {
private boolean diskSynchronous;
private boolean enableOffHeapMemory;
private String compressionCodec = "";
- private boolean hdfsWriteOnly;
private List<String> memberName = new ArrayList<String>();
private List<RegionOnMember> regionOnMembers = new ArrayList<RegionOnMember>();
@@ -1769,14 +1768,6 @@ public class Cluster extends Thread {
this.compressionCodec = compressionCodec;
}
- public boolean isHdfsWriteOnly() {
- return hdfsWriteOnly;
- }
-
- public void setHdfsWriteOnly(boolean hdfsWriteOnly) {
- this.hdfsWriteOnly = hdfsWriteOnly;
- }
-
public Cluster.RegionOnMember[] getRegionOnMembers() {
Cluster.RegionOnMember[] regionOnMembers = null;
synchronized (this.regionOnMembers) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
index c2999f8..e442b8e 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
@@ -297,7 +297,6 @@ public class PulseConstants {
public static final String COMPOSITE_DATA_KEY_DISKSTORENAME = "diskStoreName";
public static final String COMPOSITE_DATA_KEY_DISKSYNCHRONOUS = "diskSynchronous";
public static final String COMPOSITE_DATA_KEY_COMPRESSIONCODEC = "compressionCodec";
- public static final String COMPOSITE_DATA_KEY_HDFSWRITEONLY = "hdfsWriteOnly";
public static final String COMPOSITE_DATA_KEY_ENABLEOFFHEAPMEMORY = "enableOffHeapMemory";
public static final String COMPOSITE_DATA_KEY_CONNECTIONSACTIVE = "connectionsActive";
public static final String COMPOSITE_DATA_KEY_CONNECTED = "connected";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/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 5537c28..350846c 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
@@ -162,17 +162,6 @@ public class ClusterRegionService implements PulseService {
regionJSON.put("isEnableOffHeapMemory", VALUE_OFF);
}
- Boolean isHDFSWriteOnly = reg.isHdfsWriteOnly();
- if (regionType.startsWith("HDFS")) {
- if (isHDFSWriteOnly) {
- regionJSON.put("isHDFSWriteOnly", VALUE_ON);
- } else {
- regionJSON.put("isHDFSWriteOnly", VALUE_OFF);
- }
- } else {
- regionJSON.put("isHDFSWriteOnly", VALUE_NA);
- }
-
String regCompCodec = reg.getCompressionCodec();
if (StringUtils.isNotNullNotEmptyNotWhiteSpace(regCompCodec)) {
regionJSON.put("compressionCodec", reg.getCompressionCodec());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
index bd38b8d..3da4e59 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
@@ -156,17 +156,6 @@ public class ClusterRegionsService implements PulseService {
regionJSON.put("isEnableOffHeapMemory", this.VALUE_OFF);
}
- Boolean isHDFSWriteOnly = reg.isHdfsWriteOnly();
- if (regionType.startsWith("HDFS")) {
- if (isHDFSWriteOnly) {
- regionJSON.put("isHDFSWriteOnly", this.VALUE_ON);
- } else {
- regionJSON.put("isHDFSWriteOnly", this.VALUE_OFF);
- }
- } else {
- regionJSON.put("isHDFSWriteOnly", this.VALUE_NA);
- }
-
String regCompCodec = reg.getCompressionCodec();
if (StringUtils.isNotNullNotEmptyNotWhiteSpace(regCompCodec)) {
regionJSON.put("compressionCodec", reg.getCompressionCodec());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/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 35e15c6..39a67cf 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
@@ -188,12 +188,6 @@ public class ClusterSelectedRegionService implements PulseService {
regionJSON.put("isEnableOffHeapMemory", reg.isEnableOffHeapMemory() ? PulseService.VALUE_ON : PulseService.VALUE_OFF);
- if (regionType.startsWith("HDFS")) {
- regionJSON.put("isHDFSWriteOnly", reg.isHdfsWriteOnly() ? PulseService.VALUE_ON : PulseService.VALUE_OFF);
- } else {
- regionJSON.put("isHDFSWriteOnly", PulseService.VALUE_NA);
- }
-
String regCompCodec = reg.getCompressionCodec();
if (StringUtils.isNotNullNotEmptyNotWhiteSpace(regCompCodec)) {
regionJSON.put("compressionCodec", reg.getCompressionCodec());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/geode-pulse/src/main/webapp/scripts/pulsescript/PulseCallbacks.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/PulseCallbacks.js b/geode-pulse/src/main/webapp/scripts/pulsescript/PulseCallbacks.js
index adfe90c..e19ddf4 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/PulseCallbacks.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/PulseCallbacks.js
@@ -1284,7 +1284,6 @@ function updateDataViewDetails(clusterRegions) {
"persistence" : clusterRegions[i].persistence,
"isEnableOffHeapMemory" : clusterRegions[i].isEnableOffHeapMemory,
"compressionCodec" : clusterRegions[i].compressionCodec,
- "isHDFSWriteOnly" : clusterRegions[i].isHDFSWriteOnly,
"memberNames" : clusterRegions[i].memberNames,
"memoryWritesTrend" : clusterRegions[i].memoryWritesTrend,
"memoryReadsTrend" : clusterRegions[i].memoryReadsTrend,
@@ -1323,7 +1322,6 @@ function updateDataViewDetails(clusterRegions) {
"persistence" : "",
"isEnableOffHeapMemory" : "",
"compressionCodec" : "",
- "isHDFSWriteOnly" : "",
"memberNames" : "",
"memoryWritesTrend" : "",
"memoryReadsTrend" : "",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
index 6d14fd2..78c9cda 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
@@ -1321,7 +1321,7 @@ function createRegionsGridDefault() {
'Persistence', 'Entry Count', 'Empty Nodes', 'Data Usage',
'Total Data Usage', 'Memory Usage', 'Total Memory',
'Member Names', 'Writes', 'Reads','Off Heap Enabled',
- 'Compression Codec','HDFS Write Only' ],
+ 'Compression Codec' ],
colModel : [ {
name : 'name',
index : 'name',
@@ -1421,10 +1421,6 @@ function createRegionsGridDefault() {
name : 'compressionCodec',
index : 'compressionCodec',
hidden : true
- }, {
- name : 'isHDFSWriteOnly',
- index : 'isHDFSWriteOnly',
- hidden : true
}],
userData : {
"sortOrder" : "asc",
@@ -1854,7 +1850,6 @@ function buildRegionsTreeMapData(clusterRegions) {
"persistence" : clusterRegions[i].persistence,
"isEnableOffHeapMemory" : clusterRegions[i].isEnableOffHeapMemory,
"compressionCodec" : clusterRegions[i].compressionCodec,
- "isHDFSWriteOnly" : clusterRegions[i].isHDFSWriteOnly,
"memberNames" : clusterRegions[i].memberNames,
"memoryWritesTrend" : clusterRegions[i].memoryWritesTrend,
"memoryReadsTrend" : clusterRegions[i].memoryReadsTrend,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/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 38bf9c4..0dfc2fb 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
@@ -345,7 +345,6 @@ public class PulseControllerJUnitTest {
.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"))
.andExpect(jsonPath("$.ClusterRegion.region[0].memberNames[0].name").value(MEMBER_NAME))
.andExpect(jsonPath("$.ClusterRegion.region[0].memberNames[0].id").value(MEMBER_ID))
.andExpect(jsonPath("$.ClusterRegion.region[0].emptyNodes").value(0))
@@ -379,7 +378,6 @@ public class PulseControllerJUnitTest {
.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"))
.andExpect(jsonPath("$.ClusterRegions.regions[0].memberNames[0].name").value(MEMBER_NAME))
.andExpect(jsonPath("$.ClusterRegions.regions[0].memberNames[0].id").value(MEMBER_ID))
.andExpect(jsonPath("$.ClusterRegions.regions[0].emptyNodes").value(0))
@@ -430,7 +428,6 @@ public class PulseControllerJUnitTest {
.andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.memoryUsage").value("0.0000"))
.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(12.31D))
.andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.totalMemory").value(0))
.andExpect(jsonPath("$.ClusterSelectedRegion.selectedRegion.entryCount").value(0))
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/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 70476f9..1770dd5 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
@@ -32,10 +32,10 @@ public class Region extends JMXBaseBean implements RegionMBean {
private String name = null;
private static String[] regAttItemNames = { "compressionCodec",
- "enableOffHeapMemory", "hdfsWriteOnly", "scope", "diskStoreName",
+ "enableOffHeapMemory", "scope", "diskStoreName",
"diskSynchronous" };
private static String[] regAttItemDescriptions = { "compressionCodec",
- "enableOffHeapMemory", "hdfsWriteOnly", "scope", "diskStoreName",
+ "enableOffHeapMemory", "scope", "diskStoreName",
"diskSynchronous" };
private static OpenType[] regAttItemTypes = { SimpleType.STRING,
SimpleType.BOOLEAN, SimpleType.BOOLEAN, SimpleType.STRING,
@@ -158,11 +158,6 @@ public class Region extends JMXBaseBean implements RegionMBean {
itemValuesHM.put(regAttItemNames[1], Boolean.parseBoolean(itemValues[1]));
}
- // hdfsWriteOnly
- if (null != itemValues[2]) {
- itemValuesHM.put(regAttItemNames[2], Boolean.parseBoolean(itemValues[2]));
- }
-
// scope
if (null != itemValues[3]) {
itemValuesHM.put(regAttItemNames[3], itemValues[3]);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb7398f0/geode-pulse/src/test/resources/test.properties
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/resources/test.properties b/geode-pulse/src/test/resources/test.properties
index b779c16..7952c0e 100644
--- a/geode-pulse/src/test/resources/test.properties
+++ b/geode-pulse/src/test/resources/test.properties
@@ -182,7 +182,7 @@ region.R1.diskUsage=200200
#region.R1.diskSynchronous=false
# operations
# listRegionAttributes operation should values for return
-# String compressionCodec, boolean enableOffHeapMemory, boolean hdfsWriteOnly,
+# String compressionCodec, boolean enableOffHeapMemory,
# String scope, String diskStoreName, boolean diskSynchronous
region.R1.listRegionAttributes=comp-Codec,true,true,local,TestDiskStoreLcl,false
@@ -248,7 +248,7 @@ region.R2.diskUsage=200200
#region.R2.diskSynchronous=true
# operations
# listRegionAttributes operation should values for return
-# string compressionCodec, boolean enableOffHeapMemory, boolean hdfsWriteOnly
+# string compressionCodec, boolean enableOffHeapMemory,
# String scope, String diskStoreName, boolean diskSynchronous
region.R2.listRegionAttributes=comp-Codec,true,false,global,TestDiskStoreGbl,true
@@ -297,7 +297,7 @@ region.R3.diskUsage=200200
#region.R3.diskSynchronous=false
# operations
# listRegionAttributes operation should values for return
-# String compressionCodec, boolean enableOffHeapMemory, boolean hdfsWriteOnly,
+# String compressionCodec, boolean enableOffHeapMemory,
# String scope, String diskStoreName, boolean diskSynchronous
region.R3.listRegionAttributes=comp-Codec,true,true,local,TestDiskStoreLcl,false