Repository: hive Updated Branches: refs/heads/master 32ab6c082 -> af606ffd4
HIVE-15953 : better error messages for LLAP registry properties (Sergey Shelukhin, reviewed by Prasanth Jayachandran) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/af606ffd Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/af606ffd Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/af606ffd Branch: refs/heads/master Commit: af606ffd4bbd04a6def0132c8cfcba3d9067e44c Parents: 32ab6c0 Author: Sergey Shelukhin <[email protected]> Authored: Tue Feb 21 13:45:04 2017 -0800 Committer: Sergey Shelukhin <[email protected]> Committed: Tue Feb 21 13:45:04 2017 -0800 ---------------------------------------------------------------------- .../llap/registry/impl/LlapZookeeperRegistryImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/af606ffd/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java ---------------------------------------------------------------------- diff --git a/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java b/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java index 7ae80b0..0f8ff66 100644 --- a/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java +++ b/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java @@ -451,9 +451,14 @@ public class LlapZookeeperRegistryImpl implements ServiceRegistry { AddressTypes.ADDRESS_PORT_FIELD)); this.serviceAddress = RegistryTypeUtils.getAddressField(services.addresses.get(0), AddressTypes.ADDRESS_URI); - int memory = Integer.parseInt(srv.get(ConfVars.LLAP_DAEMON_MEMORY_PER_INSTANCE_MB.varname)); - int vCores = Integer.parseInt(srv.get(ConfVars.LLAP_DAEMON_NUM_EXECUTORS.varname)); - this.resource = Resource.newInstance(memory, vCores); + String memStr = srv.get(ConfVars.LLAP_DAEMON_MEMORY_PER_INSTANCE_MB.varname, ""); + String coreStr = srv.get(ConfVars.LLAP_DAEMON_NUM_EXECUTORS.varname, ""); + try { + this.resource = Resource.newInstance(Integer.parseInt(memStr), Integer.parseInt(coreStr)); + } catch (NumberFormatException ex) { + throw new IOException("Invalid resource configuration for a LLAP node: memory " + + memStr + ", vcores " + coreStr); + } } @Override
