You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by li...@apache.org on 2014/05/14 02:33:44 UTC

svn commit: r1594433 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/ClientLocalScanner.java

Author: liyin
Date: Wed May 14 00:33:44 2014
New Revision: 1594433

URL: http://svn.apache.org/r1594433
Log:
[HBASE-9704] Create a copy of the conf in ClientLocalScanner since we are modifying it

Author: manukranthk

Summary: In ClientLocalScanner.openStoresOnClient, we modify the conf to set the fs.default.name to be the value obtained from the hbase cluster the htable is create for. But, doing so will modify the conf passed in. In case the user intends to use the config later, it might have unknown effects.

Test Plan: Trivial change. Hot fix for search005

Reviewers: daviddeng

Reviewed By: daviddeng

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D1325499

Task ID: 4317015

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/ClientLocalScanner.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/ClientLocalScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/ClientLocalScanner.java?rev=1594433&r1=1594432&r2=1594433&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/ClientLocalScanner.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/ClientLocalScanner.java Wed May 14 00:33:44 2014
@@ -23,6 +23,7 @@ package org.apache.hadoop.hbase.client;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -115,7 +116,8 @@ public class ClientLocalScanner extends 
     final HRegionInfo info = this.currentRegion;
     this.currentRegion.getTableDesc().setReadOnly(true);
     HTable table = this.htable;
-    final Configuration conf = table.getConfiguration();
+    final Configuration conf =
+        HBaseConfiguration.create(table.getConfiguration());
     conf.setBoolean(HConstants.CLIENT_SIDE_SCAN, true);
     boolean flushAndWait = conf.getBoolean(
         HConstants.CLIENT_LOCAL_SCANNER_FLUSH_AND_WAIT,