You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/11/09 00:07:35 UTC
[geode] branch feature/bruce_ssl_wip updated: updates
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/bruce_ssl_wip
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/bruce_ssl_wip by this push:
new 9ee6e3a updates
9ee6e3a is described below
commit 9ee6e3a96b57f3ee23fa6031b1da2edd087b29a9
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Nov 8 16:06:45 2019 -0800
updates
---
.../org/apache/geode/ClusterCommunicationsDUnitTest.java | 8 ++++----
.../java/org/apache/geode/internal/net/NioFilter.java | 2 +-
.../org/apache/geode/internal/net/NioPlainEngine.java | 2 +-
.../java/org/apache/geode/internal/net/NioSslEngine.java | 8 ++++----
.../java/org/apache/geode/internal/tcp/Connection.java | 16 ++++++++++++----
.../apache/geode/internal/net/NioPlainEngineTest.java | 6 +++---
6 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
index a11a711..f25e61d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
@@ -165,10 +165,10 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
@Test
public void createEntryWithBigMessage() {
-// VM vm0 = Host.getHost(0).getVM("1.9.2", 0);
-// VM vm1 = Host.getHost(0).getVM("1.9.2", 1);
-// VM vm2 = Host.getHost(0).getVM("1.9.2", 2);
- VM vm0 = Host.getHost(0).getVM( 0);
+ // VM vm0 = Host.getHost(0).getVM("1.9.2", 0);
+ // VM vm1 = Host.getHost(0).getVM("1.9.2", 1);
+ // VM vm2 = Host.getHost(0).getVM("1.9.2", 2);
+ VM vm0 = Host.getHost(0).getVM(0);
VM vm1 = Host.getHost(0).getVM(1);
VM vm2 = Host.getHost(0).getVM(2);
int locatorPort = createLocator(vm0, true);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/NioFilter.java b/geode-core/src/main/java/org/apache/geode/internal/net/NioFilter.java
index d497233..aacb16f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/NioFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/NioFilter.java
@@ -56,7 +56,7 @@ public interface NioFilter {
* unwrappedBuffer = filter.readAtLeast(channel, amount, wrappedBuffer, etc.)
*/
ByteBuffer readAtLeast(SocketChannel channel, int amount, ByteBuffer wrappedBuffer,
- DMStats stats)
+ DMStats stats)
throws IOException;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/NioPlainEngine.java b/geode-core/src/main/java/org/apache/geode/internal/net/NioPlainEngine.java
index 3dbacda..8a6d02c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/NioPlainEngine.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/NioPlainEngine.java
@@ -84,7 +84,7 @@ public class NioPlainEngine implements NioFilter {
@Override
public ByteBuffer readAtLeast(SocketChannel channel, int bytes, ByteBuffer wrappedBuffer,
- DMStats stats)
+ DMStats stats)
throws IOException {
ByteBuffer buffer = wrappedBuffer;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
index 3c10bfd..517db72 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
@@ -75,8 +75,8 @@ public class NioSslEngine implements NioFilter {
int packetBufferSize = engine.getSession().getPacketBufferSize();
this.engine = engine;
this.bufferPool = bufferPool;
- this.myNetData = bufferPool.acquireDirectSenderBuffer(100000); //packetBufferSize);
- this.peerAppData = bufferPool.acquireNonDirectReceiveBuffer(100000);//appBufferSize);
+ this.myNetData = bufferPool.acquireDirectSenderBuffer(100000); // packetBufferSize);
+ this.peerAppData = bufferPool.acquireNonDirectReceiveBuffer(100000);// appBufferSize);
}
/**
@@ -315,8 +315,8 @@ public class NioSslEngine implements NioFilter {
@Override
public ByteBuffer readAtLeast(SocketChannel channel, int bytes,
- ByteBuffer wrappedBuffer,
- DMStats stats) throws IOException {
+ ByteBuffer wrappedBuffer,
+ DMStats stats) throws IOException {
if (peerAppData.capacity() > bytes) {
// we already have a buffer that's big enough
if (peerAppData.capacity() - peerAppData.position() < bytes) {
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 339cfa0..cf2e705 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
@@ -446,6 +446,11 @@ public class Connection implements Runnable {
sock.setSendBufferSize(requestedSize);
} else {
sock.setReceiveBufferSize(requestedSize);
+ int newSize = sock.getReceiveBufferSize();
+ if (newSize != requestedSize) {
+ logger.info("BRUCE: socket receive size is not the requested {} but is {}",
+ requestedSize, newSize);
+ }
}
} catch (SocketException ignore) {
}
@@ -1847,9 +1852,12 @@ public class Connection implements Runnable {
}
inputBuffer = getBufferPool().acquireDirectReceiveBuffer(packetBufferSize);
}
+ // logger.info("BRUCE: packetBufferSize for new ioFilter is " + packetBufferSize);
if (channel.socket().getReceiveBufferSize() < packetBufferSize) {
channel.socket().setReceiveBufferSize(packetBufferSize);
}
+ // logger.info("BRUCE: channel receive buffer size is " +
+ // channel.socket().getReceiveBufferSize());
if (channel.socket().getSendBufferSize() < packetBufferSize) {
channel.socket().setSendBufferSize(packetBufferSize);
}
@@ -2730,9 +2738,9 @@ public class Connection implements Runnable {
}
// fall through
}
- long startEncryption = stats.startTLSEncryption();
+ long startEncryption = stats.startTLSEncryption();
ByteBuffer wrappedBuffer = ioFilter.wrap(buffer);
- stats.endTLSEncryption(startEncryption);
+ stats.endTLSEncryption(startEncryption);
while (wrappedBuffer.remaining() > 0) {
int amtWritten = 0;
long start = stats.startSocketWrite(true);
@@ -2899,9 +2907,9 @@ public class Connection implements Runnable {
inputBuffer.flip();
- long startDecryptTime = owner.getConduit().getStats().startTLSDecryption();
+ long startDecryptTime = owner.getConduit().getStats().startTLSDecryption();
ByteBuffer peerDataBuffer = ioFilter.unwrap(inputBuffer);
- owner.getConduit().getStats().endTLSDecryption(startDecryptTime);
+ owner.getConduit().getStats().endTLSDecryption(startDecryptTime);
peerDataBuffer.flip();
boolean done = false;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/NioPlainEngineTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/NioPlainEngineTest.java
index 4b31500..cc6fb93 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/NioPlainEngineTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/NioPlainEngineTest.java
@@ -118,7 +118,7 @@ public class NioPlainEngineTest {
nioEngine.lastReadPosition = 10;
ByteBuffer data = nioEngine.readAtLeast(mockChannel, amountToRead, wrappedBuffer,
- conn.getConduit().getStats());
+ mock(DMStats.class));
verify(mockChannel, times(3)).read(isA(ByteBuffer.class));
assertThat(data.position()).isEqualTo(0);
assertThat(data.limit()).isEqualTo(amountToRead);
@@ -126,7 +126,7 @@ public class NioPlainEngineTest {
assertThat(nioEngine.lastProcessedPosition).isEqualTo(amountToRead);
data = nioEngine.readAtLeast(mockChannel, amountToRead, wrappedBuffer,
- conn.getConduit().getStats());
+ mock(DMStats.class));
verify(mockChannel, times(5)).read(any(ByteBuffer.class));
// at end of last readAtLeast data
assertThat(data.position()).isEqualTo(amountToRead);
@@ -150,7 +150,7 @@ public class NioPlainEngineTest {
nioEngine.lastReadPosition = 10;
- nioEngine.readAtLeast(mockChannel, amountToRead, wrappedBuffer, conn.getConduit().getStats());
+ nioEngine.readAtLeast(mockChannel, amountToRead, wrappedBuffer, mock(DMStats.class));
}
}