github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-03 19:51:41 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-3375: HiveMiniCluster does not restore hive-site.xml location

Browse Source 
(Szabolcs Vasas via Boglarka Egyed)
This commit is contained in:
Boglarka Egyed 2018-09-03 11:52:44 +02:00
parent 35556651e2
commit c814e58348
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/org/apache/sqoop/hive/minicluster/HiveMiniCluster.java
View File

@ -32,6 +32,7 @@
import java.io.OutputStream; import java.io.OutputStream;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
import java.net.URL;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
@ -56,6 +57,8 @@ public class HiveMiniCluster {
private HiveConf config; private HiveConf config;
private URL originalHiveSiteLocation;
public HiveMiniCluster(AuthenticationConfiguration authenticationConfiguration) { public HiveMiniCluster(AuthenticationConfiguration authenticationConfiguration) {
this(DEFAULT_HOST, DEFAULT_PORT, authenticationConfiguration); this(DEFAULT_HOST, DEFAULT_PORT, authenticationConfiguration);
} }
@ -102,6 +105,7 @@ private void createHiveSiteXml() throws IOException {
config.writeXml(out); config.writeXml(out);
} }
originalHiveSiteLocation = HiveConf.getHiveSiteLocation();
HiveConf.setHiveSiteLocation(hiveSiteXmlFile.toURI().toURL()); HiveConf.setHiveSiteLocation(hiveSiteXmlFile.toURI().toURL());
} }
@ -118,7 +122,7 @@ public Void run() {
public void stop() { public void stop() {
hiveServer2.stop(); hiveServer2.stop();
HiveConf.setHiveSiteLocation(null); HiveConf.setHiveSiteLocation(originalHiveSiteLocation);
try { try {
FileUtils.deleteDirectory(new File(tempFolderPath)); FileUtils.deleteDirectory(new File(tempFolderPath));
} catch (IOException e) { } catch (IOException e) {