Repository: incubator-slider
Updated Branches:
  refs/heads/develop 1a4c9ca73 -> d4f1ae5b8


SLIDER-914 Make hbase.bulkload.staging.dir config unique per Slider instance


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d4f1ae5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d4f1ae5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d4f1ae5b

Branch: refs/heads/develop
Commit: d4f1ae5b87b68135a71a0d5ff8cdb398149faeda
Parents: 1a4c9ca
Author: tedyu <[email protected]>
Authored: Mon Jul 20 15:46:55 2015 -0700
Committer: tedyu <[email protected]>
Committed: Mon Jul 20 15:46:55 2015 -0700

----------------------------------------------------------------------
 app-packages/hbase/appConfig-phoenix-default.json | 3 ++-
 app-packages/hbase/appConfig-secured-default.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d4f1ae5b/app-packages/hbase/appConfig-phoenix-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-phoenix-default.json 
b/app-packages/hbase/appConfig-phoenix-default.json
index 54fbe0e..03885f8 100644
--- a/app-packages/hbase/appConfig-phoenix-default.json
+++ b/app-packages/hbase/appConfig-phoenix-default.json
@@ -27,7 +27,8 @@
         "site.hbase-env.hbase_master_heapsize": "1024m",
         "site.hbase-env.hbase_regionserver_heapsize": "1024m",
 
-        "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}",
+        "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}/data",
+        "site.hbase-site.hbase.bulkload.staging.dir": 
"${DEFAULT_DATA_DIR}/hbase-staging",
         "site.hbase-site.hbase.superuser": "${USER_NAME}",
         "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp",
         "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local",

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d4f1ae5b/app-packages/hbase/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-secured-default.json 
b/app-packages/hbase/appConfig-secured-default.json
index e232090..396da77 100644
--- a/app-packages/hbase/appConfig-secured-default.json
+++ b/app-packages/hbase/appConfig-secured-default.json
@@ -27,7 +27,8 @@
         "site.hbase-env.hbase_master_heapsize": "1024m",
         "site.hbase-env.hbase_regionserver_heapsize": "1024m",
 
-        "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}",
+        "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}/data",
+        "site.hbase-site.hbase.bulkload.staging.dir": 
"${DEFAULT_DATA_DIR}/hbase-staging",
         "site.hbase-site.hbase.superuser": "${USER_NAME}",
         "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp",
         "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local",

Reply via email to