flume git commit: FLUME-3157. Refactor TestHDFSEventSinkOnMiniCluster to not use LeaseManager private API

[de...@apache.org]

Repository: flume
Updated Branches:
  refs/heads/trunk a7d2a289a -> 32c167dcc


FLUME-3157. Refactor TestHDFSEventSinkOnMiniCluster to not use LeaseManager private API

This fix removes LeaseManager private API usages from tests in
TestHDFSEventSinkOnMiniCluster as these methods are expected to be
removed/changed in future versions of Hadoop/HDFS.

Test refactored, it has the same result and behaviour.

This closes #164

Reviewers: Denes Arvay

(Ferenc Szabo via Denes Arvay)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/32c167dc
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/32c167dc
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/32c167dc

Branch: refs/heads/trunk
Commit: 32c167dccd711f163221b374bf6a4af68e66f0df
Parents: a7d2a28
Author: Ferenc Szabo <fs...@cloudera.com>
Authored: Fri Sep 1 19:10:27 2017 +0200
Committer: Denes Arvay <de...@apache.org>
Committed: Mon Sep 4 11:39:19 2017 +0200

----------------------------------------------------------------------
 .../flume/sink/hdfs/TestHDFSEventSinkOnMiniCluster.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/32c167dc/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSinkOnMiniCluster.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSinkOnMiniCluster.java b/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSinkOnMiniCluster.java
index d35bce5..9400c9c 100644
--- a/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSinkOnMiniCluster.java
+++ b/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSinkOnMiniCluster.java
@@ -40,7 +40,6 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
 import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -570,18 +569,18 @@ public class TestHDFSEventSinkOnMiniCluster {
     Assert.assertEquals(1, statuses.length);
 
     String filePath = statuses[0].getPath().toUri().getPath();
-    LeaseManager lm = NameNodeAdapter.getLeaseManager(cluster.getNamesystem());
 
-    Object lease = lm.getLeaseByPath(filePath);
+    // -1 in case that the lease doesn't exist.
+    long leaseRenewalTime = NameNodeAdapter.getLeaseRenewalTime(cluster.getNameNode(), filePath);
     // wait until the NameNode recovers the lease
-    for (int i = 0; i < 10 && lease != null; i++) {
+    for (int i = 0; (i < 10) && (leaseRenewalTime != -1L); i++) {
       TimeUnit.SECONDS.sleep(1);
-      lease = lm.getLeaseByPath(filePath);
+      leaseRenewalTime = NameNodeAdapter.getLeaseRenewalTime(cluster.getNameNode(), filePath);
     }
 
     // There should be no lease for the given path even if close failed as the BucketWriter
     // explicitly calls the recoverLease()
-    Assert.assertNull(lease);
+    Assert.assertEquals(-1L, leaseRenewalTime);
 
     if (!KEEP_DATA) {
       fs.delete(outputDirPath, true);