You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/03/31 16:48:33 UTC
[1/5] hadoop git commit: HDFS-13289. RBF:
TestConnectionManager#testCleanup() test case need correction. Contributed by
Dibyendu Karmakar.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 de419e277 -> c6a013c9e
refs/heads/branch-2.9 b0d602112 -> 72bc5a86a
refs/heads/branch-3.0 4ba5efa96 -> 8266696aa
refs/heads/branch-3.1 4ce45a8ec -> 3c9983547
refs/heads/trunk acfd764fc -> dc8e34320
HDFS-13289. RBF: TestConnectionManager#testCleanup() test case need correction. Contributed by Dibyendu Karmakar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dc8e3432
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dc8e3432
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dc8e3432
Branch: refs/heads/trunk
Commit: dc8e3432013153ac11d31d6b462aa96f8ca2c443
Parents: acfd764
Author: Inigo Goiri <in...@apache.org>
Authored: Sat Mar 31 09:46:13 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Sat Mar 31 09:46:13 2018 -0700
----------------------------------------------------------------------
.../router/TestConnectionManager.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc8e3432/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
index 741d1f6..2e4b80d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
@@ -29,6 +29,7 @@ import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Test functionalities of {@link ConnectionManager}, which manages a pool
@@ -94,14 +95,20 @@ public class TestConnectionManager {
// Make sure the number of connections doesn't go below minSize
ConnectionPool pool3 = new ConnectionPool(
conf, TEST_NN_ADDRESS, TEST_USER3, 2, 10);
- addConnectionsToPool(pool3, 10, 0);
- poolMap.put(new ConnectionPoolId(TEST_USER2, TEST_NN_ADDRESS), pool3);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 0);
+ poolMap.put(new ConnectionPoolId(TEST_USER3, TEST_NN_ADDRESS), pool3);
+ checkPoolConnections(TEST_USER3, 10, 0);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 2, 0);
// With active connections added to pool, make sure it honors the
// MIN_ACTIVE_RATIO again
- addConnectionsToPool(pool3, 10, 2);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 2);
+ checkPoolConnections(TEST_USER3, 10, 2);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 4, 2);
}
@@ -145,13 +152,18 @@ public class TestConnectionManager {
private void checkPoolConnections(UserGroupInformation ugi,
int numOfConns, int numOfActiveConns) {
+ boolean connPoolFoundForUser = false;
for (Map.Entry<ConnectionPoolId, ConnectionPool> e :
connManager.getPools().entrySet()) {
if (e.getKey().getUgi() == ugi) {
assertEquals(numOfConns, e.getValue().getNumConnections());
assertEquals(numOfActiveConns, e.getValue().getNumActiveConnections());
+ connPoolFoundForUser = true;
}
}
+ if (!connPoolFoundForUser) {
+ fail("Connection pool not found for user " + ugi.getUserName());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HDFS-13289. RBF:
TestConnectionManager#testCleanup() test case need correction. Contributed by
Dibyendu Karmakar.
Posted by in...@apache.org.
HDFS-13289. RBF: TestConnectionManager#testCleanup() test case need correction. Contributed by Dibyendu Karmakar.
(cherry picked from commit dc8e3432013153ac11d31d6b462aa96f8ca2c443)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72bc5a86
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72bc5a86
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72bc5a86
Branch: refs/heads/branch-2.9
Commit: 72bc5a86aa46c3ca8a7a9db81ffec343d9e45af7
Parents: b0d6021
Author: Inigo Goiri <in...@apache.org>
Authored: Sat Mar 31 09:46:13 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Sat Mar 31 09:47:53 2018 -0700
----------------------------------------------------------------------
.../router/TestConnectionManager.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/72bc5a86/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
index 741d1f6..2e4b80d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
@@ -29,6 +29,7 @@ import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Test functionalities of {@link ConnectionManager}, which manages a pool
@@ -94,14 +95,20 @@ public class TestConnectionManager {
// Make sure the number of connections doesn't go below minSize
ConnectionPool pool3 = new ConnectionPool(
conf, TEST_NN_ADDRESS, TEST_USER3, 2, 10);
- addConnectionsToPool(pool3, 10, 0);
- poolMap.put(new ConnectionPoolId(TEST_USER2, TEST_NN_ADDRESS), pool3);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 0);
+ poolMap.put(new ConnectionPoolId(TEST_USER3, TEST_NN_ADDRESS), pool3);
+ checkPoolConnections(TEST_USER3, 10, 0);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 2, 0);
// With active connections added to pool, make sure it honors the
// MIN_ACTIVE_RATIO again
- addConnectionsToPool(pool3, 10, 2);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 2);
+ checkPoolConnections(TEST_USER3, 10, 2);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 4, 2);
}
@@ -145,13 +152,18 @@ public class TestConnectionManager {
private void checkPoolConnections(UserGroupInformation ugi,
int numOfConns, int numOfActiveConns) {
+ boolean connPoolFoundForUser = false;
for (Map.Entry<ConnectionPoolId, ConnectionPool> e :
connManager.getPools().entrySet()) {
if (e.getKey().getUgi() == ugi) {
assertEquals(numOfConns, e.getValue().getNumConnections());
assertEquals(numOfActiveConns, e.getValue().getNumActiveConnections());
+ connPoolFoundForUser = true;
}
}
+ if (!connPoolFoundForUser) {
+ fail("Connection pool not found for user " + ugi.getUserName());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: HDFS-13289. RBF:
TestConnectionManager#testCleanup() test case need correction. Contributed by
Dibyendu Karmakar.
Posted by in...@apache.org.
HDFS-13289. RBF: TestConnectionManager#testCleanup() test case need correction. Contributed by Dibyendu Karmakar.
(cherry picked from commit dc8e3432013153ac11d31d6b462aa96f8ca2c443)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3c998354
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3c998354
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3c998354
Branch: refs/heads/branch-3.1
Commit: 3c9983547cd878f4ad946804c0316de1637ca135
Parents: 4ce45a8
Author: Inigo Goiri <in...@apache.org>
Authored: Sat Mar 31 09:46:13 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Sat Mar 31 09:46:44 2018 -0700
----------------------------------------------------------------------
.../router/TestConnectionManager.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c998354/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
index 741d1f6..2e4b80d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
@@ -29,6 +29,7 @@ import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Test functionalities of {@link ConnectionManager}, which manages a pool
@@ -94,14 +95,20 @@ public class TestConnectionManager {
// Make sure the number of connections doesn't go below minSize
ConnectionPool pool3 = new ConnectionPool(
conf, TEST_NN_ADDRESS, TEST_USER3, 2, 10);
- addConnectionsToPool(pool3, 10, 0);
- poolMap.put(new ConnectionPoolId(TEST_USER2, TEST_NN_ADDRESS), pool3);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 0);
+ poolMap.put(new ConnectionPoolId(TEST_USER3, TEST_NN_ADDRESS), pool3);
+ checkPoolConnections(TEST_USER3, 10, 0);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 2, 0);
// With active connections added to pool, make sure it honors the
// MIN_ACTIVE_RATIO again
- addConnectionsToPool(pool3, 10, 2);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 2);
+ checkPoolConnections(TEST_USER3, 10, 2);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 4, 2);
}
@@ -145,13 +152,18 @@ public class TestConnectionManager {
private void checkPoolConnections(UserGroupInformation ugi,
int numOfConns, int numOfActiveConns) {
+ boolean connPoolFoundForUser = false;
for (Map.Entry<ConnectionPoolId, ConnectionPool> e :
connManager.getPools().entrySet()) {
if (e.getKey().getUgi() == ugi) {
assertEquals(numOfConns, e.getValue().getNumConnections());
assertEquals(numOfActiveConns, e.getValue().getNumActiveConnections());
+ connPoolFoundForUser = true;
}
}
+ if (!connPoolFoundForUser) {
+ fail("Connection pool not found for user " + ugi.getUserName());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: HDFS-13289. RBF:
TestConnectionManager#testCleanup() test case need correction. Contributed by
Dibyendu Karmakar.
Posted by in...@apache.org.
HDFS-13289. RBF: TestConnectionManager#testCleanup() test case need correction. Contributed by Dibyendu Karmakar.
(cherry picked from commit dc8e3432013153ac11d31d6b462aa96f8ca2c443)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8266696a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8266696a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8266696a
Branch: refs/heads/branch-3.0
Commit: 8266696aa3cc9f6c3c84cc2ae0fb068fffcae78e
Parents: 4ba5efa
Author: Inigo Goiri <in...@apache.org>
Authored: Sat Mar 31 09:46:13 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Sat Mar 31 09:47:06 2018 -0700
----------------------------------------------------------------------
.../router/TestConnectionManager.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8266696a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
index 741d1f6..2e4b80d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
@@ -29,6 +29,7 @@ import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Test functionalities of {@link ConnectionManager}, which manages a pool
@@ -94,14 +95,20 @@ public class TestConnectionManager {
// Make sure the number of connections doesn't go below minSize
ConnectionPool pool3 = new ConnectionPool(
conf, TEST_NN_ADDRESS, TEST_USER3, 2, 10);
- addConnectionsToPool(pool3, 10, 0);
- poolMap.put(new ConnectionPoolId(TEST_USER2, TEST_NN_ADDRESS), pool3);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 0);
+ poolMap.put(new ConnectionPoolId(TEST_USER3, TEST_NN_ADDRESS), pool3);
+ checkPoolConnections(TEST_USER3, 10, 0);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 2, 0);
// With active connections added to pool, make sure it honors the
// MIN_ACTIVE_RATIO again
- addConnectionsToPool(pool3, 10, 2);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 2);
+ checkPoolConnections(TEST_USER3, 10, 2);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 4, 2);
}
@@ -145,13 +152,18 @@ public class TestConnectionManager {
private void checkPoolConnections(UserGroupInformation ugi,
int numOfConns, int numOfActiveConns) {
+ boolean connPoolFoundForUser = false;
for (Map.Entry<ConnectionPoolId, ConnectionPool> e :
connManager.getPools().entrySet()) {
if (e.getKey().getUgi() == ugi) {
assertEquals(numOfConns, e.getValue().getNumConnections());
assertEquals(numOfActiveConns, e.getValue().getNumActiveConnections());
+ connPoolFoundForUser = true;
}
}
+ if (!connPoolFoundForUser) {
+ fail("Connection pool not found for user " + ugi.getUserName());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HDFS-13289. RBF:
TestConnectionManager#testCleanup() test case need correction. Contributed by
Dibyendu Karmakar.
Posted by in...@apache.org.
HDFS-13289. RBF: TestConnectionManager#testCleanup() test case need correction. Contributed by Dibyendu Karmakar.
(cherry picked from commit dc8e3432013153ac11d31d6b462aa96f8ca2c443)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6a013c9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6a013c9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6a013c9
Branch: refs/heads/branch-2
Commit: c6a013c9e0da5ec9a622ec3e453778de387da7db
Parents: de419e2
Author: Inigo Goiri <in...@apache.org>
Authored: Sat Mar 31 09:46:13 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Sat Mar 31 09:47:36 2018 -0700
----------------------------------------------------------------------
.../router/TestConnectionManager.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6a013c9/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
index 741d1f6..2e4b80d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java
@@ -29,6 +29,7 @@ import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Test functionalities of {@link ConnectionManager}, which manages a pool
@@ -94,14 +95,20 @@ public class TestConnectionManager {
// Make sure the number of connections doesn't go below minSize
ConnectionPool pool3 = new ConnectionPool(
conf, TEST_NN_ADDRESS, TEST_USER3, 2, 10);
- addConnectionsToPool(pool3, 10, 0);
- poolMap.put(new ConnectionPoolId(TEST_USER2, TEST_NN_ADDRESS), pool3);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 0);
+ poolMap.put(new ConnectionPoolId(TEST_USER3, TEST_NN_ADDRESS), pool3);
+ checkPoolConnections(TEST_USER3, 10, 0);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 2, 0);
// With active connections added to pool, make sure it honors the
// MIN_ACTIVE_RATIO again
- addConnectionsToPool(pool3, 10, 2);
- connManager.cleanup(pool3);
+ addConnectionsToPool(pool3, 8, 2);
+ checkPoolConnections(TEST_USER3, 10, 2);
+ for (int i = 0; i < 10; i++) {
+ connManager.cleanup(pool3);
+ }
checkPoolConnections(TEST_USER3, 4, 2);
}
@@ -145,13 +152,18 @@ public class TestConnectionManager {
private void checkPoolConnections(UserGroupInformation ugi,
int numOfConns, int numOfActiveConns) {
+ boolean connPoolFoundForUser = false;
for (Map.Entry<ConnectionPoolId, ConnectionPool> e :
connManager.getPools().entrySet()) {
if (e.getKey().getUgi() == ugi) {
assertEquals(numOfConns, e.getValue().getNumConnections());
assertEquals(numOfActiveConns, e.getValue().getNumActiveConnections());
+ connPoolFoundForUser = true;
}
}
+ if (!connPoolFoundForUser) {
+ fail("Connection pool not found for user " + ugi.getUserName());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org