[accumulo] branch 2.0 updated: avoid calling auto-close on Accumulo client (#1353)

[edcoleman]

This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.0 by this push:
     new e37b2e8  avoid calling auto-close on Accumulo client (#1353)
e37b2e8 is described below

commit e37b2e82f1db4270a1a9d25aebc5da31eefe37d1
Author: EdColeman <d...@etcoleman.com>
AuthorDate: Fri Sep 6 20:23:33 2019 -0400

    avoid calling auto-close on Accumulo client (#1353)
    
    Restores previous behavior and now passes testing.
---
 .../src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
 
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index ae6f0f4..d32832d 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -698,8 +698,9 @@ abstract class TabletGroupWatcher extends Daemon {
       targetSystemTable = RootTable.NAME;
     }
 
-    try (AccumuloClient client = this.master.getContext();
-        BatchWriter bw = client.createBatchWriter(targetSystemTable, new 
BatchWriterConfig())) {
+    AccumuloClient client = this.master.getContext();
+
+    try (BatchWriter bw = client.createBatchWriter(targetSystemTable, new 
BatchWriterConfig())) {
       long fileCount = 0;
       // Make file entries in highest tablet
       Scanner scanner = client.createScanner(targetSystemTable, 
Authorizations.EMPTY);