TAJO-687: TajoMaster should pass tajoConf to create catalogServer. (DaeMyung Kang via jihoon)
diff --git a/CHANGES.txt b/CHANGES.txt
index d51dfcb..2495fe7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -276,6 +276,9 @@
BUG FIXES
+ TAJO-687: TajoMaster should pass tajoConf to create catalogServer.
+ (DaeMyung Kang via jihoon)
+
TAJO-690: infinite loop occurs when rack task is assigning. (jinho)
TAJO-689: NoSuchElementException occurs during assigning the leaf tasks. (jinho)
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java
index eb062fd..df9bd2c 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java
@@ -43,7 +43,11 @@
}
public LocalCatalogWrapper(final CatalogServer server) {
- super(server.getConf(), null);
+ this(server, server.getConf());
+ }
+
+ public LocalCatalogWrapper(final CatalogServer server, final TajoConf conf) {
+ super(conf, null);
this.catalog = server;
this.stub = server.getHandler();
}
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
index c42b0f3..9fcfca9 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
@@ -163,7 +163,7 @@
catalogServer = new CatalogServer(initBuiltinFunctions());
addIfService(catalogServer);
- catalog = new LocalCatalogWrapper(catalogServer);
+ catalog = new LocalCatalogWrapper(catalogServer, systemConf);
globalEngine = new GlobalEngine(context);
addIfService(globalEngine);
