You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2019/08/20 19:05:54 UTC
[geode] 06/10: fixing spotless and pmd errors from reverts
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch release/1.9.1
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3f0498f9aeaa464ad62eb2bca2343287c7b5d7c9
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Thu Jun 27 14:59:28 2019 -0700
fixing spotless and pmd errors from reverts
---
.../internal/net/SSLSocketIntegrationTest.java | 1 -
.../statistics/platform/LinuxProcFsStatistics.java | 178 +++++++++++----------
.../org/apache/geode/internal/tcp/Buffers.java | 1 +
.../org/apache/geode/internal/tcp/Connection.java | 2 +-
.../org/apache/geode/internal/tcp/TCPConduit.java | 3 +
5 files changed, 95 insertions(+), 90 deletions(-)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index 32640d9..bc8b230 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -59,7 +59,6 @@ import org.junit.rules.TestName;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.internal.tcp.ByteBufferInputStream;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.junit.categories.MembershipTest;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
index 3f687ca..f5f7d9a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
@@ -64,7 +64,8 @@ public class LinuxProcFsStatistics {
private static boolean hasProcVmStat;
@MakeNotStatic
private static boolean hasDiskStats;
- static SpaceTokenizer st;
+ @MakeNotStatic
+ static SpaceTokenizer tokenizer;
/** The number of non-process files in /proc */
@MakeNotStatic
@@ -91,13 +92,13 @@ public class LinuxProcFsStatistics {
cpuStatSingleton = new CpuStat();
hasProcVmStat = new File("/proc/vmstat").exists();
hasDiskStats = new File("/proc/diskstats").exists();
- st = new SpaceTokenizer();
+ tokenizer = new SpaceTokenizer();
return 0;
}
public static void close() { // TODO: was package-protected
cpuStatSingleton = null;
- st = null;
+ tokenizer = null;
}
public static void readyRefresh() { // TODO: was package-protected
@@ -125,10 +126,11 @@ public class LinuxProcFsStatistics {
if (line == null) {
return;
}
- st.setString(line);
- st.skipTokens(22);
- ints[LinuxProcessStats.imageSizeINT] = (int) (st.nextTokenAsLong() / OneMeg);
- ints[LinuxProcessStats.rssSizeINT] = (int) ((st.nextTokenAsLong() * pageSize) / OneMeg);
+ tokenizer.setString(line);
+ tokenizer.skipTokens(22);
+ ints[LinuxProcessStats.imageSizeINT] = (int) (tokenizer.nextTokenAsLong() / OneMeg);
+ ints[LinuxProcessStats.rssSizeINT] =
+ (int) ((tokenizer.nextTokenAsLong() * pageSize) / OneMeg);
} catch (NoSuchElementException nsee) {
// It might just be a case of the process going away while we
// where trying to get its stats.
@@ -140,7 +142,7 @@ public class LinuxProcFsStatistics {
// So for now lets just ignore the failure and leave the stats
// as they are.
} finally {
- st.releaseResources();
+ tokenizer.releaseResources();
if (br != null)
try {
br.close();
@@ -215,7 +217,7 @@ public class LinuxProcFsStatistics {
if (hasProcVmStat) {
getVmStats(longs);
}
- st.releaseResources();
+ tokenizer.releaseResources();
}
// Example of /proc/loadavg
@@ -230,14 +232,14 @@ public class LinuxProcFsStatistics {
if (line == null) {
return;
}
- st.setString(line);
- doubles[LinuxSystemStats.loadAverage1DOUBLE] = st.nextTokenAsDouble();
- doubles[LinuxSystemStats.loadAverage5DOUBLE] = st.nextTokenAsDouble();
- doubles[LinuxSystemStats.loadAverage15DOUBLE] = st.nextTokenAsDouble();
+ tokenizer.setString(line);
+ doubles[LinuxSystemStats.loadAverage1DOUBLE] = tokenizer.nextTokenAsDouble();
+ doubles[LinuxSystemStats.loadAverage5DOUBLE] = tokenizer.nextTokenAsDouble();
+ doubles[LinuxSystemStats.loadAverage15DOUBLE] = tokenizer.nextTokenAsDouble();
} catch (NoSuchElementException nsee) {
} catch (IOException ioe) {
} finally {
- st.releaseResources();
+ tokenizer.releaseResources();
if (br != null)
try {
br.close();
@@ -295,41 +297,41 @@ public class LinuxProcFsStatistics {
while ((line = br.readLine()) != null) {
try {
if (line.startsWith("MemTotal: ")) {
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.physicalMemoryINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.physicalMemoryINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("MemFree: ")) {
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.freeMemoryINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.freeMemoryINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("SharedMem: ")) {
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.sharedMemoryINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.sharedMemoryINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("Buffers: ")) {
- st.setString(line);
- st.nextToken(); // Burn initial token
- ints[LinuxSystemStats.bufferMemoryINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.nextToken(); // Burn initial token
+ ints[LinuxSystemStats.bufferMemoryINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("SwapTotal: ")) {
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.allocatedSwapINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.allocatedSwapINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("SwapFree: ")) {
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.unallocatedSwapINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.unallocatedSwapINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("Cached: ")) {
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.cachedMemoryINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.cachedMemoryINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("Dirty: ")) {
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.dirtyMemoryINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.dirtyMemoryINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
} else if (line.startsWith("Inact_dirty: ")) { // 2.4 kernels
- st.setString(line);
- st.skipToken(); // Burn initial token
- ints[LinuxSystemStats.dirtyMemoryINT] = (int) (st.nextTokenAsLong() / 1024);
+ tokenizer.setString(line);
+ tokenizer.skipToken(); // Burn initial token
+ ints[LinuxSystemStats.dirtyMemoryINT] = (int) (tokenizer.nextTokenAsLong() / 1024);
}
} catch (NoSuchElementException nsee) {
// ignore and let that stat not to be updated this time
@@ -337,7 +339,7 @@ public class LinuxProcFsStatistics {
}
} catch (IOException ioe) {
} finally {
- st.releaseResources();
+ tokenizer.releaseResources();
if (br != null)
try {
br.close();
@@ -362,13 +364,13 @@ public class LinuxProcFsStatistics {
line = br.readLine();
} while (line != null && !line.startsWith("TcpExt:"));
- st.setString(line);
- st.skipTokens(1);
- long tcpSyncookiesSent = st.nextTokenAsLong();
- long tcpSyncookiesRecv = st.nextTokenAsLong();
- st.skipTokens(17);
- long tcpListenOverflows = st.nextTokenAsLong();
- long tcpListenDrops = st.nextTokenAsLong();
+ tokenizer.setString(line);
+ tokenizer.skipTokens(1);
+ long tcpSyncookiesSent = tokenizer.nextTokenAsLong();
+ long tcpSyncookiesRecv = tokenizer.nextTokenAsLong();
+ tokenizer.skipTokens(17);
+ long tcpListenOverflows = tokenizer.nextTokenAsLong();
+ long tcpListenDrops = tokenizer.nextTokenAsLong();
longs[LinuxSystemStats.tcpExtSynCookiesRecvLONG] = tcpSyncookiesRecv;
longs[LinuxSystemStats.tcpExtSynCookiesSentLONG] = tcpSyncookiesSent;
@@ -380,8 +382,8 @@ public class LinuxProcFsStatistics {
isr = new InputStreamReader(new FileInputStream("/proc/sys/net/core/somaxconn"));
br = new BufferedReader(isr);
line = br.readLine();
- st.setString(line);
- soMaxConn = st.nextTokenAsInt();
+ tokenizer.setString(line);
+ soMaxConn = tokenizer.nextTokenAsInt();
soMaxConnProcessed = true;
}
@@ -390,7 +392,7 @@ public class LinuxProcFsStatistics {
} catch (NoSuchElementException nsee) {
} catch (IOException ioe) {
} finally {
- st.releaseResources();
+ tokenizer.releaseResources();
if (br != null) {
try {
br.close();
@@ -423,18 +425,18 @@ public class LinuxProcFsStatistics {
while ((line = br.readLine()) != null) {
int index = line.indexOf(":");
boolean isloopback = (line.indexOf("lo:") != -1);
- st.setString(line.substring(index + 1).trim());
- long recv_bytes = st.nextTokenAsLong();
- long recv_packets = st.nextTokenAsLong();
- long recv_errs = st.nextTokenAsLong();
- long recv_drop = st.nextTokenAsLong();
- st.skipTokens(4); // fifo, frame, compressed, multicast
- long xmit_bytes = st.nextTokenAsLong();
- long xmit_packets = st.nextTokenAsLong();
- long xmit_errs = st.nextTokenAsLong();
- long xmit_drop = st.nextTokenAsLong();
- st.skipToken(); // fifo
- long xmit_colls = st.nextTokenAsLong();
+ tokenizer.setString(line.substring(index + 1).trim());
+ long recv_bytes = tokenizer.nextTokenAsLong();
+ long recv_packets = tokenizer.nextTokenAsLong();
+ long recv_errs = tokenizer.nextTokenAsLong();
+ long recv_drop = tokenizer.nextTokenAsLong();
+ tokenizer.skipTokens(4); // fifo, frame, compressed, multicast
+ long xmit_bytes = tokenizer.nextTokenAsLong();
+ long xmit_packets = tokenizer.nextTokenAsLong();
+ long xmit_errs = tokenizer.nextTokenAsLong();
+ long xmit_drop = tokenizer.nextTokenAsLong();
+ tokenizer.skipToken(); // fifo
+ long xmit_colls = tokenizer.nextTokenAsLong();
if (isloopback) {
lo_recv_packets = recv_packets;
@@ -471,7 +473,7 @@ public class LinuxProcFsStatistics {
} catch (NoSuchElementException nsee) {
} catch (IOException ioe) {
} finally {
- st.releaseResources();
+ tokenizer.releaseResources();
if (br != null)
try {
br.close();
@@ -531,22 +533,22 @@ public class LinuxProcFsStatistics {
br.readLine(); // Discard header info
}
while ((line = br.readLine()) != null) {
- st.setString(line);
+ tokenizer.setString(line);
{
// " 8 1 sdb" on 2.6
// " 8 1 452145145 sdb" on 2.4
- String tok = st.nextToken();
+ String tok = tokenizer.nextToken();
if (tok.length() == 0 || Character.isWhitespace(tok.charAt(0))) {
// skip over first token since it is whitespace
- tok = st.nextToken();
+ tok = tokenizer.nextToken();
}
// skip first token it is some number
- tok = st.nextToken();
+ tok = tokenizer.nextToken();
// skip second token it is some number
- tok = st.nextToken();
+ tok = tokenizer.nextToken();
if (!hasDiskStats) {
// skip third token it is some number
- tok = st.nextToken();
+ tok = tokenizer.nextToken();
}
// Now tok should be the device name.
if (Character.isDigit(tok.charAt(tok.length() - 1))) {
@@ -555,20 +557,20 @@ public class LinuxProcFsStatistics {
continue;
}
}
- long tmp_readsCompleted = st.nextTokenAsLong();
- long tmp_readsMerged = st.nextTokenAsLong();
- long tmp_sectorsRead = st.nextTokenAsLong();
- long tmp_timeReading = st.nextTokenAsLong();
- if (st.hasMoreTokens()) {
+ long tmp_readsCompleted = tokenizer.nextTokenAsLong();
+ long tmp_readsMerged = tokenizer.nextTokenAsLong();
+ long tmp_sectorsRead = tokenizer.nextTokenAsLong();
+ long tmp_timeReading = tokenizer.nextTokenAsLong();
+ if (tokenizer.hasMoreTokens()) {
// If we are on 2.6 then we might only have 4 longs; if so ignore this line
// Otherwise we should have 11 long tokens.
- long tmp_writesCompleted = st.nextTokenAsLong();
- long tmp_writesMerged = st.nextTokenAsLong();
- long tmp_sectorsWritten = st.nextTokenAsLong();
- long tmp_timeWriting = st.nextTokenAsLong();
- long tmp_iosInProgress = st.nextTokenAsLong();
- long tmp_timeIosInProgress = st.nextTokenAsLong();
- long tmp_ioTime = st.nextTokenAsLong();
+ long tmp_writesCompleted = tokenizer.nextTokenAsLong();
+ long tmp_writesMerged = tokenizer.nextTokenAsLong();
+ long tmp_sectorsWritten = tokenizer.nextTokenAsLong();
+ long tmp_timeWriting = tokenizer.nextTokenAsLong();
+ long tmp_iosInProgress = tokenizer.nextTokenAsLong();
+ long tmp_timeIosInProgress = tokenizer.nextTokenAsLong();
+ long tmp_ioTime = tokenizer.nextTokenAsLong();
readsCompleted += tmp_readsCompleted;
readsMerged += tmp_readsMerged;
sectorsRead += tmp_sectorsRead;
@@ -599,7 +601,7 @@ public class LinuxProcFsStatistics {
// NoSuchElementException line=" + line, nsee);
} catch (IOException ioe) {
} finally {
- st.releaseResources();
+ tokenizer.releaseResources();
if (br != null)
try {
br.close();
@@ -708,8 +710,8 @@ public class LinuxProcFsStatistics {
}
public int[] calculateStats(String newStatLine) {
- st.setString(newStatLine);
- st.skipToken(); // cpu name
+ tokenizer.setString(newStatLine);
+ tokenizer.skipToken(); // cpu name
final int MAX_CPU_STATS = CPU.values().length;
/*
* newer kernels now have 10 columns for cpu in /proc/stat. This number may increase even
@@ -722,8 +724,8 @@ public class LinuxProcFsStatistics {
int actualCpuStats = 0;
long unaccountedCpuUtilization = 0;
- while (st.hasMoreTokens()) {
- newStats.add(st.nextTokenAsLong());
+ while (tokenizer.hasMoreTokens()) {
+ newStats.add(tokenizer.nextTokenAsLong());
actualCpuStats++;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java
index b0f5612..fda7c0e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Buffers.java
@@ -28,6 +28,7 @@ public class Buffers {
/**
* A list of soft references to byte buffers.
*/
+ @MakeNotStatic
private static final ConcurrentLinkedQueue bufferQueue = new ConcurrentLinkedQueue();
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 47e90a2..395130f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -48,7 +48,6 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
-import org.apache.geode.SerializationException;
import org.apache.geode.SystemFailure;
import org.apache.geode.annotations.internal.MakeNotStatic;
import org.apache.geode.annotations.internal.MutableForTesting;
@@ -98,6 +97,7 @@ public class Connection implements Runnable {
@MakeNotStatic
private static final int INITIAL_CAPACITY =
Integer.getInteger("p2p.readerBufferSize", 32768).intValue();
+ @MakeNotStatic
private static int P2P_CONNECT_TIMEOUT;
@MakeNotStatic
private static boolean IS_P2P_CONNECT_TIMEOUT_INITIALIZED = false;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
index c6b8bf9..fbda5b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
@@ -110,6 +110,7 @@ public class TCPConduit implements Runnable {
/**
* use javax.net.ssl.SSLServerSocketFactory?
*/
+ @MakeNotStatic
static boolean useSSL;
/**
@@ -117,11 +118,13 @@ public class TCPConduit implements Runnable {
* java VM, NIO cannot be used with IPv6 addresses on Windows. When that condition holds, the
* useNIO flag must be disregarded.
*/
+ @MakeNotStatic
private static boolean USE_NIO;
/**
* use direct ByteBuffers instead of heap ByteBuffers for NIO operations
*/
+ @MakeNotStatic
static boolean useDirectBuffers;
/**