[3/3] hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

2018-09-05 Thread apurtell 
HBASE-21088 HStoreFile should be closed in HStore#hasReferences

Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java


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

Branch: refs/heads/branch-1
Commit: d07cab18a620661f527dec542fb90eaffa71ef0b
Parents: dbb634a
Author: tedyu 
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: Andrew Purtell 
Committed: Wed Sep 5 15:13:06 2018 -0700

--
 .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d07cab18/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 6ce41e3..f10d055 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1645,6 +1645,17 @@ public class HStore implements Store {
   LOG.error("Error trying to determine if store has referenes, " + 
"assuming references exists",
 ioe);
   return true;
+} finally {
+  if (reloadedStoreFiles != null) {
+for (StoreFile storeFile : reloadedStoreFiles) {
+  try {
+storeFile.closeReader(false);
+  } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+// continue with closing the remaining store files
+  }
+}
+  }
 }
 return StoreUtils.hasReferences(reloadedStoreFiles);
   }

[1/3] hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

2018-09-05 Thread apurtell 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 dbb634ad1 -> d07cab18a
  refs/heads/branch-1.3 bc429d89c -> 36ef36ccc
  refs/heads/branch-1.4 15f17302e -> d0b0df020


HBASE-21088 HStoreFile should be closed in HStore#hasReferences

Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/36ef36cc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/36ef36cc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/36ef36cc

Branch: refs/heads/branch-1.3
Commit: 36ef36ccc5babbf1e398097855ded3e2e1b9dc34
Parents: bc429d8
Author: tedyu 
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: Andrew Purtell 
Committed: Wed Sep 5 15:12:41 2018 -0700

--
 .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/36ef36cc/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 76073d0..0f6536f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1605,6 +1605,17 @@ public class HStore implements Store {
   LOG.error("Error trying to determine if store has referenes, " + 
"assuming references exists",
 ioe);
   return true;
+} finally {
+  if (reloadedStoreFiles != null) {
+for (StoreFile storeFile : reloadedStoreFiles) {
+  try {
+storeFile.closeReader(false);
+  } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+// continue with closing the remaining store files
+  }
+}
+  }
 }
 return StoreUtils.hasReferences(reloadedStoreFiles);
   }

[2/3] hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

2018-09-05 Thread apurtell 
HBASE-21088 HStoreFile should be closed in HStore#hasReferences

Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java


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

Branch: refs/heads/branch-1.4
Commit: d0b0df020022930c981a36a4ba973fba2dbbf2cd
Parents: 15f1730
Author: tedyu 
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: Andrew Purtell 
Committed: Wed Sep 5 15:12:56 2018 -0700

--
 .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d0b0df02/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index e37baf8..af9a006 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1634,6 +1634,17 @@ public class HStore implements Store {
   LOG.error("Error trying to determine if store has referenes, " + 
"assuming references exists",
 ioe);
   return true;
+} finally {
+  if (reloadedStoreFiles != null) {
+for (StoreFile storeFile : reloadedStoreFiles) {
+  try {
+storeFile.closeReader(false);
+  } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+// continue with closing the remaining store files
+  }
+}
+  }
 }
 return StoreUtils.hasReferences(reloadedStoreFiles);
   }

hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

2018-08-27 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2.1 e826e3f2b -> c1cd6d5a8


HBASE-21088 HStoreFile should be closed in HStore#hasReferences


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

Branch: refs/heads/branch-2.1
Commit: c1cd6d5a89966f3cfec378146f8088f80d6d36ac
Parents: e826e3f
Author: Ted Yu 
Authored: Mon Aug 27 20:31:08 2018 -0700
Committer: Michael Stack 
Committed: Mon Aug 27 20:31:50 2018 -0700

--
 .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c1cd6d5a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 7566a70..80f1f21 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1670,6 +1670,17 @@ public class HStore implements Store, HeapSize, 
StoreConfigInformation, Propagat
   LOG.error("Error trying to determine if store has references, assuming 
references exists",
 ioe);
   return true;
+} finally {
+  if (reloadedStoreFiles != null) {
+for (HStoreFile storeFile : reloadedStoreFiles) {
+  try {
+storeFile.closeStoreFile(false);
+  } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+// continue with closing the remaining store files
+  }
+}
+  }
 }
   }

hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

2018-08-27 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 dc53d3087 -> f89b4ed9d


HBASE-21088 HStoreFile should be closed in HStore#hasReferences


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

Branch: refs/heads/branch-2.0
Commit: f89b4ed9d6ff3b8a1cf83196d061d99f044f8f23
Parents: dc53d30
Author: Ted Yu 
Authored: Mon Aug 27 20:31:08 2018 -0700
Committer: Michael Stack 
Committed: Mon Aug 27 20:31:08 2018 -0700

--
 .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f89b4ed9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index dad9346..2227e58 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1643,6 +1643,17 @@ public class HStore implements Store, HeapSize, 
StoreConfigInformation, Propagat
   LOG.error("Error trying to determine if store has references, assuming 
references exists",
 ioe);
   return true;
+} finally {
+  if (reloadedStoreFiles != null) {
+for (HStoreFile storeFile : reloadedStoreFiles) {
+  try {
+storeFile.closeStoreFile(false);
+  } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+// continue with closing the remaining store files
+  }
+}
+  }
 }
   }

hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

2018-08-27 Thread tedyu 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 4f32883e9 -> f9790b01d


HBASE-21088 HStoreFile should be closed in HStore#hasReferences


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

Branch: refs/heads/branch-2
Commit: f9790b01d9ffd9457abe33d8a65a0a467389f4d6
Parents: 4f32883
Author: tedyu 
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: tedyu 
Committed: Mon Aug 27 09:38:03 2018 -0700

--
 .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f9790b01/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 1b95a77..ea699ea 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1670,6 +1670,17 @@ public class HStore implements Store, HeapSize, 
StoreConfigInformation, Propagat
   LOG.error("Error trying to determine if store has references, assuming 
references exists",
 ioe);
   return true;
+} finally {
+  if (reloadedStoreFiles != null) {
+for (HStoreFile storeFile : reloadedStoreFiles) {
+  try {
+storeFile.closeStoreFile(false);
+  } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+// continue with closing the remaining store files
+  }
+}
+  }
 }
   }

hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

2018-08-27 Thread tedyu 
Repository: hbase
Updated Branches:
  refs/heads/master 993e74b74 -> 9e2732edb


HBASE-21088 HStoreFile should be closed in HStore#hasReferences


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9e2732ed
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9e2732ed
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9e2732ed

Branch: refs/heads/master
Commit: 9e2732edbbc1e207392bb5e3493dcf1b42a2dbcf
Parents: 993e74b
Author: tedyu 
Authored: Mon Aug 27 09:36:44 2018 -0700
Committer: tedyu 
Committed: Mon Aug 27 09:36:44 2018 -0700

--
 .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/9e2732ed/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 1ff9043..a040184 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1712,6 +1712,17 @@ public class HStore implements Store, HeapSize, 
StoreConfigInformation, Propagat
   LOG.error("Error trying to determine if store has references, assuming 
references exists",
 ioe);
   return true;
+} finally {
+  if (reloadedStoreFiles != null) {
+for (HStoreFile storeFile : reloadedStoreFiles) {
+  try {
+storeFile.closeStoreFile(false);
+  } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+// continue with closing the remaining store files
+  }
+}
+  }
 }
   }