[22/44] hadoop git commit: HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee.
HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2408f313
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2408f313
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2408f313
Branch: refs/heads/HDFS-EC
Commit: 2408f313674e1c8bfc118fabcaad6fb89a275f38
Parents: 30c4c6a
Author: Kihwal Lee kih...@apache.org
Authored: Thu Jan 15 14:58:52 2015 -0600
Committer: Zhe Zhang z...@apache.org
Committed: Tue Jan 20 09:43:10 2015 -0800
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../hdfs/server/namenode/FSNamesystem.java | 34 +---
.../hdfs/server/namenode/FSNamesystemLock.java | 22 -
.../org/apache/hadoop/hdfs/util/RwLock.java | 9 --
4 files changed, 3 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2408f313/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index c3d32b8..823b3d1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -520,6 +520,8 @@ Release 2.7.0 - UNRELEASED
HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
(Vinayakumar B via wheat9)
+HDFS-7615. Remove longReadLock (kihwal)
+
BUG FIXES
HDFS-6741. Improve permission denied message when
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2408f313/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index e7bf8e9..9d2fe6b 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -1465,47 +1465,20 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
this.fsLock.readLock().lock();
}
@Override
- public void longReadLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.readLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS read
lock,
- // release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
- }
- @Override
- public void longReadUnlock() {
-this.fsLock.readLock().unlock();
-this.fsLock.longReadLock().unlock();
- }
- @Override
public void readUnlock() {
this.fsLock.readLock().unlock();
}
@Override
public void writeLock() {
-this.fsLock.longReadLock().lock();
this.fsLock.writeLock().lock();
}
@Override
public void writeLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.writeLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS write
- // lock, release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
+this.fsLock.writeLock().lockInterruptibly();
}
@Override
public void writeUnlock() {
this.fsLock.writeLock().unlock();
-this.fsLock.longReadLock().unlock();
}
@Override
public boolean hasWriteLock() {
@@ -7138,11 +7111,6 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
}
@VisibleForTesting
- public ReentrantLock getLongReadLockForTests() {
-return fsLock.longReadLock;
- }
-
- @VisibleForTesting
public ReentrantLock getCpLockForTests() {
return cpLock;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2408f313/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
index f031284..7e820d8 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
+++
[20/25] hadoop git commit: HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee.
HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44eed6cb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44eed6cb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44eed6cb
Branch: refs/heads/YARN-2928
Commit: 44eed6cbc97649c15177f9b36f6b119cc1900f7a
Parents: b6ff9c0
Author: Kihwal Lee kih...@apache.org
Authored: Thu Jan 15 14:58:52 2015 -0600
Committer: Kihwal Lee kih...@apache.org
Committed: Thu Jan 15 16:39:18 2015 -0600
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../hdfs/server/namenode/FSNamesystem.java | 34 +---
.../hdfs/server/namenode/FSNamesystemLock.java | 22 -
.../org/apache/hadoop/hdfs/util/RwLock.java | 9 --
4 files changed, 3 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44eed6cb/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index c3d32b8..823b3d1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -520,6 +520,8 @@ Release 2.7.0 - UNRELEASED
HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
(Vinayakumar B via wheat9)
+HDFS-7615. Remove longReadLock (kihwal)
+
BUG FIXES
HDFS-6741. Improve permission denied message when
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44eed6cb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index e7bf8e9..9d2fe6b 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -1465,47 +1465,20 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
this.fsLock.readLock().lock();
}
@Override
- public void longReadLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.readLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS read
lock,
- // release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
- }
- @Override
- public void longReadUnlock() {
-this.fsLock.readLock().unlock();
-this.fsLock.longReadLock().unlock();
- }
- @Override
public void readUnlock() {
this.fsLock.readLock().unlock();
}
@Override
public void writeLock() {
-this.fsLock.longReadLock().lock();
this.fsLock.writeLock().lock();
}
@Override
public void writeLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.writeLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS write
- // lock, release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
+this.fsLock.writeLock().lockInterruptibly();
}
@Override
public void writeUnlock() {
this.fsLock.writeLock().unlock();
-this.fsLock.longReadLock().unlock();
}
@Override
public boolean hasWriteLock() {
@@ -7138,11 +7111,6 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
}
@VisibleForTesting
- public ReentrantLock getLongReadLockForTests() {
-return fsLock.longReadLock;
- }
-
- @VisibleForTesting
public ReentrantLock getCpLockForTests() {
return cpLock;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44eed6cb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
index f031284..7e820d8 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
+++
hadoop git commit: HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee. (cherry picked from commit 44eed6cbc97649c15177f9b36f6b119cc1900f7a)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 450561a93 - 0090157ff
HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee.
(cherry picked from commit 44eed6cbc97649c15177f9b36f6b119cc1900f7a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0090157f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0090157f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0090157f
Branch: refs/heads/branch-2
Commit: 0090157fffdbbdbd82410d886bb9add74ca1a674
Parents: 450561a
Author: Kihwal Lee kih...@apache.org
Authored: Thu Jan 15 16:40:18 2015 -0600
Committer: Kihwal Lee kih...@apache.org
Committed: Thu Jan 15 16:40:18 2015 -0600
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../hdfs/server/namenode/FSNamesystem.java | 34 +---
.../hdfs/server/namenode/FSNamesystemLock.java | 22 -
.../org/apache/hadoop/hdfs/util/RwLock.java | 9 --
4 files changed, 3 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0090157f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d6375cf..51c2c1f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -250,6 +250,8 @@ Release 2.7.0 - UNRELEASED
HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
(Vinayakumar B via wheat9)
+HDFS-7615. Remove longReadLock (kihwal)
+
BUG FIXES
HDFS-6741. Improve permission denied message when
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0090157f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 67dbeb1..8403f37 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -1456,47 +1456,20 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
this.fsLock.readLock().lock();
}
@Override
- public void longReadLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.readLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS read
lock,
- // release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
- }
- @Override
- public void longReadUnlock() {
-this.fsLock.readLock().unlock();
-this.fsLock.longReadLock().unlock();
- }
- @Override
public void readUnlock() {
this.fsLock.readLock().unlock();
}
@Override
public void writeLock() {
-this.fsLock.longReadLock().lock();
this.fsLock.writeLock().lock();
}
@Override
public void writeLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.writeLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS write
- // lock, release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
+this.fsLock.writeLock().lockInterruptibly();
}
@Override
public void writeUnlock() {
this.fsLock.writeLock().unlock();
-this.fsLock.longReadLock().unlock();
}
@Override
public boolean hasWriteLock() {
@@ -6916,11 +6889,6 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
}
@VisibleForTesting
- public ReentrantLock getLongReadLockForTests() {
-return fsLock.longReadLock;
- }
-
- @VisibleForTesting
public ReentrantLock getCpLockForTests() {
return cpLock;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0090157f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
index f031284..7e820d8 100644
---
hadoop git commit: HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee.
Repository: hadoop
Updated Branches:
refs/heads/trunk b6ff9c03a - 44eed6cbc
HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44eed6cb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44eed6cb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44eed6cb
Branch: refs/heads/trunk
Commit: 44eed6cbc97649c15177f9b36f6b119cc1900f7a
Parents: b6ff9c0
Author: Kihwal Lee kih...@apache.org
Authored: Thu Jan 15 14:58:52 2015 -0600
Committer: Kihwal Lee kih...@apache.org
Committed: Thu Jan 15 16:39:18 2015 -0600
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../hdfs/server/namenode/FSNamesystem.java | 34 +---
.../hdfs/server/namenode/FSNamesystemLock.java | 22 -
.../org/apache/hadoop/hdfs/util/RwLock.java | 9 --
4 files changed, 3 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44eed6cb/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index c3d32b8..823b3d1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -520,6 +520,8 @@ Release 2.7.0 - UNRELEASED
HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
(Vinayakumar B via wheat9)
+HDFS-7615. Remove longReadLock (kihwal)
+
BUG FIXES
HDFS-6741. Improve permission denied message when
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44eed6cb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index e7bf8e9..9d2fe6b 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -1465,47 +1465,20 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
this.fsLock.readLock().lock();
}
@Override
- public void longReadLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.readLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS read
lock,
- // release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
- }
- @Override
- public void longReadUnlock() {
-this.fsLock.readLock().unlock();
-this.fsLock.longReadLock().unlock();
- }
- @Override
public void readUnlock() {
this.fsLock.readLock().unlock();
}
@Override
public void writeLock() {
-this.fsLock.longReadLock().lock();
this.fsLock.writeLock().lock();
}
@Override
public void writeLockInterruptibly() throws InterruptedException {
-this.fsLock.longReadLock().lockInterruptibly();
-try {
- this.fsLock.writeLock().lockInterruptibly();
-} catch (InterruptedException ie) {
- // In the event we're interrupted while getting the normal FSNS write
- // lock, release the long read lock.
- this.fsLock.longReadLock().unlock();
- throw ie;
-}
+this.fsLock.writeLock().lockInterruptibly();
}
@Override
public void writeUnlock() {
this.fsLock.writeLock().unlock();
-this.fsLock.longReadLock().unlock();
}
@Override
public boolean hasWriteLock() {
@@ -7138,11 +7111,6 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
}
@VisibleForTesting
- public ReentrantLock getLongReadLockForTests() {
-return fsLock.longReadLock;
- }
-
- @VisibleForTesting
public ReentrantLock getCpLockForTests() {
return cpLock;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44eed6cb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
index f031284..7e820d8 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystemLock.java
+++
