You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ts...@apache.org on 2015/05/02 08:28:27 UTC
[01/17] drill git commit: Adding fa horizontal bars to see if those
show up on android mobile browser on tablet. Centering footer.
Repository: drill
Updated Branches:
refs/heads/gh-pages 6ed707ba1 -> 17da0254e
Adding fa horizontal bars to see if those show up on android mobile
browser on tablet. Centering footer.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/96843b31
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/96843b31
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/96843b31
Branch: refs/heads/gh-pages
Commit: 96843b31731d7df74b56a216b39b04c73ec8b7c9
Parents: d14f5a8
Author: Danny <dk...@batchblue.com>
Authored: Fri May 1 09:52:06 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Fri May 1 09:52:06 2015 -0400
----------------------------------------------------------------------
_includes/menu.html | 4 ++--
_layouts/post.html | 4 +++-
css/docpage.css | 8 +++++---
css/responsive.css | 1 +
4 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/96843b31/_includes/menu.html
----------------------------------------------------------------------
diff --git a/_includes/menu.html b/_includes/menu.html
index 71a7c01..2a33d8d 100755
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -3,11 +3,11 @@
<div id="menu" class="mw">
<ul>
<li class='toc-categories'>
- <a class="expand-toc-icon" href="javascript:void(0);">☰</a>
+ <a class="expand-toc-icon" href="javascript:void(0);"><i class="fa fa-bars"></i></a>
</li>
<li class="logo"><a href="{{ site.baseurl }}/"></a></li>
<li class='expand-menu'>
- <a href="javascript:void(0);"><span class='menu-text'>Menu</span><span class='expand-icon'>☰</span></a>
+ <a href="javascript:void(0);"><span class='menu-text'>Menu</span><span class='expand-icon'><i class="fa fa-bars"></i></span></a>
</li>
<li class='clear-float'></li>
<li class="documentation-menu">
http://git-wip-us.apache.org/repos/asf/drill/blob/96843b31/_layouts/post.html
----------------------------------------------------------------------
diff --git a/_layouts/post.html b/_layouts/post.html
index 070bf62..d98656c 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -4,7 +4,9 @@ layout: default
<div class="post int_text">
<header class="post-header">
- <h1 class="post-title">{{ page.title }}</h1>
+ <div class="int_title">
+ <h1 class="post-title">{{ page.title }}</h1>
+ </div>
<p class="post-meta">
{% if page.authors.size > 1 %}
<strong>Authors:</strong>
http://git-wip-us.apache.org/repos/asf/drill/blob/96843b31/css/docpage.css
----------------------------------------------------------------------
diff --git a/css/docpage.css b/css/docpage.css
index 1b120e4..d88ded6 100644
--- a/css/docpage.css
+++ b/css/docpage.css
@@ -412,6 +412,9 @@ span.expand.show, span.contract.show {
.int_title h1 {
font-size: 28px;
}
+ .page-wrap #footer {
+ width: auto;
+ }
}
@media (min-width: 1025px) {
.main-content-wrapper {
@@ -425,7 +428,7 @@ span.expand.show, span.contract.show {
padding-left: 30px;
}
#footer .wrapper {
- margin-left: 293px;
+ margin-left: 313px;
}
.breadcrumbs {
margin-left: 0px;
@@ -440,6 +443,5 @@ div.page-wrap:after {
}
*/
#footer {
- position: absolute;
- width: 100%;
+ width: 1092px;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/96843b31/css/responsive.css
----------------------------------------------------------------------
diff --git a/css/responsive.css b/css/responsive.css
index 9aeed3e..fd2d327 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -86,6 +86,7 @@
}
#menu ul li.expand-menu, #menu ul li.expand-menu a {
height: 50px;
+ width: 110px;
}
#menu ul li.expand-menu span.expand-icon{
font-size: 24px;
[17/17] drill git commit: Merge branch 'gh-pages' of
https://github.com/tshiran/drill into gh-pages
Posted by ts...@apache.org.
Merge branch 'gh-pages' of https://github.com/tshiran/drill into gh-pages
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/17da0254
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/17da0254
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/17da0254
Branch: refs/heads/gh-pages
Commit: 17da0254e4ea69c18ad76b40b99087b1b62e12fc
Parents: 884a7d1 9aafec2
Author: Tomer Shiran <ts...@gmail.com>
Authored: Fri May 1 23:24:30 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Fri May 1 23:24:30 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 406 +++++++++----------
.../035-plugin-configuration-introduction.md | 133 ++++++
...storage-plugin-configuration-introduction.md | 133 ------
...-configuring-drill-in-a-dedicated-cluster.md | 2 +-
.../012-configuring-a-multitenant-cluster.md | 5 +
.../012-configuring-different-workloads.md | 5 -
...guring-a-multitenant-cluster-introduction.md | 22 +
...nfiguring-dfferent-workloads-introduction.md | 22 -
.../015-configuring-drill-in-a-cluster.md | 79 ----
.../015-configuring-multitenant-resources.md | 80 ++++
.../017-configuring-a-shared-drillbit.md | 2 +-
.../data-types/010-supported-data-types.md | 12 +-
.../020-getting-to-know-the-drill-sandbox.md | 2 +-
community.html | 4 +-
docs.html | 9 +-
images/docs_intro.png | Bin 0 -> 7433 bytes
16 files changed, 461 insertions(+), 455 deletions(-)
----------------------------------------------------------------------
[11/17] drill git commit: fix image path
Posted by ts...@apache.org.
fix image path
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/eeea1300
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/eeea1300
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/eeea1300
Branch: refs/heads/gh-pages
Commit: eeea1300b27fc17f1e11fa4c3f2ccc912c9643e1
Parents: af8511f
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 14:54:18 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 14:54:18 2015 -0700
----------------------------------------------------------------------
docs.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/eeea1300/docs.html
----------------------------------------------------------------------
diff --git a/docs.html b/docs.html
index c700874..f86b2b7 100644
--- a/docs.html
+++ b/docs.html
@@ -8,7 +8,7 @@ relative_path: 'docs.html'
Welcome to the Apache Drill Documentation. If you do not see the navigation bar for the documentation, click the menu icon on the left side of the top of any page.
-<p><img src="images/docs_intro.png" alt="navigate documentation"></p>
+<p><img src="/images/docs_intro.png" alt="navigate documentation"></p>
If you're new to Drill, try out one of these resources:
<ul>
[03/17] drill git commit: fix link
Posted by ts...@apache.org.
fix link
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/12f73de1
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/12f73de1
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/12f73de1
Branch: refs/heads/gh-pages
Commit: 12f73de19d96e217e2e0a828078ec80cbdef4120
Parents: a9da61a
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 11:13:00 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 11:13:00 2015 -0700
----------------------------------------------------------------------
_docs/manage-drill/015-configuring-drill-in-a-cluster.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/12f73de1/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
index 9e46732..8c71e95 100644
--- a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
@@ -1,4 +1,4 @@
- ---
+---
title: "Configuring Resources in a Mixed Cluster"
parent: "Configuring Different Workloads"
---
[15/17] drill git commit: docpage layout now inherits from default.
Fixed hilighting of current toc menu item,
where the parent li was not getting the current_section class.
Posted by ts...@apache.org.
docpage layout now inherits from default. Fixed hilighting of current
toc menu item, where the parent li was not getting the current_section
class.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/906611da
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/906611da
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/906611da
Branch: refs/heads/gh-pages
Commit: 906611daa52e2e0c3135694ddc015a36d0de24d6
Parents: 96843b3
Author: Danny <dk...@batchblue.com>
Authored: Fri May 1 23:37:10 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Fri May 1 23:37:10 2015 -0400
----------------------------------------------------------------------
_includes/doctoc.html | 2 +-
_layouts/docpage.html | 19 ++-----------------
2 files changed, 3 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/906611da/_includes/doctoc.html
----------------------------------------------------------------------
diff --git a/_includes/doctoc.html b/_includes/doctoc.html
index 726f778..070ffb1 100644
--- a/_includes/doctoc.html
+++ b/_includes/doctoc.html
@@ -17,7 +17,7 @@ Notes:
{% if doc0.children.size == 0 %}
<li class="toctree-l1{% if page.title == doc0.title %} current{% endif %}"><a class="reference internal" href="{{ site.baseurl }}{{ doc0.url }}">{{ doc0.title }}</a></li>
{% else %}
- <li class="toctree-l1{% if page.title == doc0.title %} current{% endif %}"><a href="javascript: void(0);">{{ doc0.title }}</a></li>
+ <li class="toctree-l1{% if page.title == doc0.title %} current{% endif %}{%if titles_array contains doc0.title %} current_section {% endif %}"><a href="javascript: void(0);">{{ doc0.title }}</a></li>
<ul {% if titles_array contains doc0.title %}class="current_section"{% else %}style="display: none"{% endif %}>
{% for doc1 in doc0.children %}
{% if doc1.children.size == 0 %}
http://git-wip-us.apache.org/repos/asf/drill/blob/906611da/_layouts/docpage.html
----------------------------------------------------------------------
diff --git a/_layouts/docpage.html b/_layouts/docpage.html
index 72fb5b5..de08169 100644
--- a/_layouts/docpage.html
+++ b/_layouts/docpage.html
@@ -1,19 +1,11 @@
---
+layout: default
title: Documentation
---
-<!DOCTYPE html>
-<html>
-
-{% include head.html %}
-
-<body onResize="resized();">
-<div class="page-wrap">
- {% include menu.html %}
{% include doctoc.html %}
-
-
{% include breadcrumbs.html %}
+
<div class="main-content-wrapper">
<div class="main-content">
@@ -51,10 +43,3 @@ title: Documentation
</div>
</div>
</div>
-
- {% include footer.html %}
-</div>
-{% include scripts.html %}
-</body>
-</html>
-
[10/17] drill git commit: placeholder docs opener
Posted by ts...@apache.org.
placeholder docs opener
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/af8511f4
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/af8511f4
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/af8511f4
Branch: refs/heads/gh-pages
Commit: af8511f4b2fdbf772713b39b3a7bc1fca1def673
Parents: d6fcfbe
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 14:47:22 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 14:47:22 2015 -0700
----------------------------------------------------------------------
docs.html | 9 +++++++--
images/docs_intro.png | Bin 0 -> 7433 bytes
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/af8511f4/docs.html
----------------------------------------------------------------------
diff --git a/docs.html b/docs.html
index f00adf8..c700874 100644
--- a/docs.html
+++ b/docs.html
@@ -6,7 +6,12 @@ relative_path: 'docs.html'
---
-Welcome to the Apache Drill Documentation. If you're new to Drill, try out one of these resources:
+Welcome to the Apache Drill Documentation. If you do not see the navigation bar for the documentation, click the menu icon on the left side of the top of any page.
+
+<p><img src="images/docs_intro.png" alt="navigate documentation"></p>
+
+If you're new to Drill, try out one of these resources:
<ul>
+ <li><a href="{{ site.baseurl }}docs/drill-in-10-minutes/">Drill in 10 Minutes</a></li>
<li><a href="{{ site.baseurl }}/docs/analyzing-the-yelp-academic-dataset/">Analyzing the Yelp Academic Dataset</a></li>
-</ul>
+</ul>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/af8511f4/images/docs_intro.png
----------------------------------------------------------------------
diff --git a/images/docs_intro.png b/images/docs_intro.png
new file mode 100644
index 0000000..21103b4
Binary files /dev/null and b/images/docs_intro.png differ
[12/17] drill git commit: fix image link
Posted by ts...@apache.org.
fix image link
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/12f520a0
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/12f520a0
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/12f520a0
Branch: refs/heads/gh-pages
Commit: 12f520a0485cb4b8d8ab0c8de252fe93f8505baf
Parents: eeea130
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 14:58:14 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 14:58:14 2015 -0700
----------------------------------------------------------------------
docs.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/12f520a0/docs.html
----------------------------------------------------------------------
diff --git a/docs.html b/docs.html
index f86b2b7..8e3d978 100644
--- a/docs.html
+++ b/docs.html
@@ -8,10 +8,10 @@ relative_path: 'docs.html'
Welcome to the Apache Drill Documentation. If you do not see the navigation bar for the documentation, click the menu icon on the left side of the top of any page.
-<p><img src="/images/docs_intro.png" alt="navigate documentation"></p>
+<p><img src="{{ site.baseurl }}/images/docs_intro.png" alt="navigate documentation"></p>
If you're new to Drill, try out one of these resources:
<ul>
- <li><a href="{{ site.baseurl }}docs/drill-in-10-minutes/">Drill in 10 Minutes</a></li>
+ <li><a href="{{ site.baseurl }}/docs/drill-in-10-minutes/">Drill in 10 Minutes</a></li>
<li><a href="{{ site.baseurl }}/docs/analyzing-the-yelp-academic-dataset/">Analyzing the Yelp Academic Dataset</a></li>
</ul>
\ No newline at end of file
[06/17] drill git commit: fix links
Posted by ts...@apache.org.
fix links
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d56fcb40
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d56fcb40
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d56fcb40
Branch: refs/heads/gh-pages
Commit: d56fcb40fcba45afa9fbaa716c4ba5014aa4d9dd
Parents: bcc1bc0
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 11:24:01 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 11:24:01 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 8 +-
...nfiguring-dfferent-workloads-introduction.md | 2 +-
...-configuring-resources-in-a-mixed-cluster.md | 80 ++++++++++++++++++++
3 files changed, 85 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/d56fcb40/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 6805349..83fb2b4 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -881,7 +881,7 @@
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads Introduction",
"previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
"title": "Configuring Resources in a Mixed Cluster",
"url": "/docs/configuring-resources-in-a-mixed-cluster/"
},
@@ -992,7 +992,7 @@
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads Introduction",
"previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
"title": "Configuring Resources in a Mixed Cluster",
"url": "/docs/configuring-resources-in-a-mixed-cluster/"
},
@@ -3530,7 +3530,7 @@
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads Introduction",
"previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
"title": "Configuring Resources in a Mixed Cluster",
"url": "/docs/configuring-resources-in-a-mixed-cluster/"
},
@@ -10958,7 +10958,7 @@
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads Introduction",
"previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
"title": "Configuring Resources in a Mixed Cluster",
"url": "/docs/configuring-resources-in-a-mixed-cluster/"
},
http://git-wip-us.apache.org/repos/asf/drill/blob/d56fcb40/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
index efbbb2e..4bd1664 100644
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -16,7 +16,7 @@ Drill typically runs along side other workloads, including the following:
You need to plan and configure these resources for use with Drill and other workloads:
* [Memory]({{site.baseurl}}/docs/configuring-resources-in-a-mixed-cluster)
-* [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-mixed-cluster#how-to-manage-drill-cpu-resources)
+* [CPU]({{site.baseurl}}/docs/configuring-resources-in-a-mixed-cluster#how-to-manage-drill-cpu-resources)
* Disk
Configure, memory, queues, and parallelization when users [share a Drillbit]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/d56fcb40/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md b/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md
new file mode 100644
index 0000000..474d123
--- /dev/null
+++ b/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md
@@ -0,0 +1,80 @@
+---
+title: "Configuring Resources in a Mixed Cluster"
+parent: "Configuring Different Workloads"
+---
+Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. To configure resources for Drill in a MapR cluster, modify one or more of the following files in `/opt/mapr/conf/conf.d` that the installation process creates.
+
+* `warden.drill-bits.conf`
+* `warden.nodemanager.conf`
+* `warden.resourcemanager.conf`
+
+Configure Drill memory by modifying `warden.drill-bits.conf` in YARN and non-YARN clusters. Configure other resources by modifying `warden.nodemanager.conf `and `warden.resourcemanager.conf `in a YARN-enabled cluster.
+
+## Configuring Drill Memory in a Mixed Cluster
+
+Add the following lines to the `warden.drill-bits.conf` file to configure memory resources for Drill:
+
+ service.heapsize.min=<some value in MB>
+ service.heapsize.max=<some value in MB>
+ service.heapsize.percent=<a whole number>
+
+The service.heapsize.percent is the percentage of memory for the service bounded by minimum and maximum values.
+
+## Configuring Drill in a YARN-enabled MapR Cluster
+
+To add Drill to a YARN-enabled cluster, change memory resources to suit your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
+
+File system = 20G
+HBase = 20G
+Yarn = 20G
+OS = 8G
+
+If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
+
+{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
+
+YARN consists of two main services:
+
+* ResourceManager
+ There is at least one instance in a cluster, more if you configure high availability.
+* NodeManager
+ There is one instance per node.
+
+ResourceManager and NodeManager memory in `warden.resourcemanager.conf` and
+ `warden.nodemanager.conf` are set to the following defaults.
+
+ service.heapsize.min=64
+ service.heapsize.max=325
+ service.heapsize.percent=2
+
+Change these settings for NodeManager and ResourceManager to reconfigure the total memory required for YARN services to run. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh. The -Xmx option is not set, allowing memory on to grow as needed.
+
+### MapReduce v1 Resources
+
+The following default settings in /opt/mapr/conf/warden.conf control MapReduce v1 memory:
+
+ mr1.memory.percent=50
+ mr1.cpu.percent=50
+ mr1.disk.percent=50
+
+Modify these settings to reconfigure MapReduce v1 resources to suit your application needs, as described in section ["Resource Allocation for Jobs and Applications"](http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications) of the MapR documentation. Remaining memory is given to YARN applications.
+
+
+### MapReduce v2 and other Resources
+
+You configure memory for each service by setting three values in `warden.conf`.
+
+ service.command.<servicename>.heapsize.percent
+ service.command.<servicename>.heapsize.max
+ service.command.<servicename>.heapsize.min
+
+Configure memory for other services in the same manner, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf)
+
+For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
+
+* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
+* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
+* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
+
+## How to Manage Drill CPU Resources
+Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file
[09/17] drill git commit: tshiran > apache for links in html
Posted by ts...@apache.org.
tshiran > apache for links in html
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d6fcfbe5
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d6fcfbe5
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d6fcfbe5
Branch: refs/heads/gh-pages
Commit: d6fcfbe542a5c13eb6050b40b71b673bc52e1d0a
Parents: 850355f
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 14:13:25 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 14:13:25 2015 -0700
----------------------------------------------------------------------
.../data-types/010-supported-data-types.md | 12 ++++++------
.../020-getting-to-know-the-drill-sandbox.md | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/d6fcfbe5/_docs/sql-reference/data-types/010-supported-data-types.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/data-types/010-supported-data-types.md b/_docs/sql-reference/data-types/010-supported-data-types.md
index 27dfbd8..f5ef3da 100644
--- a/_docs/sql-reference/data-types/010-supported-data-types.md
+++ b/_docs/sql-reference/data-types/010-supported-data-types.md
@@ -38,12 +38,12 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
<tr>
<td valign="top">FLOAT</td>
<td valign="top">4-byte floating point number</td>
- <td valign="top">0.456<br><a href="http://tshiran.github.io/drill/docs/handling-different-data-types/">See guidelines</a></td>
+ <td valign="top">0.456<br><a href="http://apache.github.io/drill/docs/handling-different-data-types/">See guidelines</a></td>
</tr>
<tr>
<td valign="top">DOUBLE, DOUBLE PRECISION</td>
<td valign="top">8-byte floating point number, precision-scalable. Precision (p) is digits in the number. Scale (s) is digits to the right of the decimal point. Specify both p and s or neither. Default is 1.</td>
- <td valign="top">0.456<br><a href="http://tshiran.github.io/drill/docs/handling-different-data-types/">See guidelines</a></td>
+ <td valign="top">0.456<br><a href="http://apache.github.io/drill/docs/handling-different-data-types/">See guidelines</a></td>
</tr>
<tr>
<td valign="top">INTEGER or INT</td>
@@ -53,12 +53,12 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
<tr>
<td valign="top">INTERVALDAY</td>
<td valign="top">A period of time in days, hours, minutes, and seconds only</td>
- <td valign="top">'1 10:20:30.123'<br><a href="http://tshiran.github.io/drill/docs/date-time-and-timestamp/#intervalyear-and-intervalday">More examples</a></td>
+ <td valign="top">'1 10:20:30.123'<br><a href="http://apache.github.io/drill/docs/date-time-and-timestamp/#intervalyear-and-intervalday">More examples</a></td>
</tr>
<tr>
<td valign="top">INTERVALYEAR</td>
<td valign="top">A period of time in years and months only</td>
- <td valign="top">'1-2' year to month<br><a href="http://tshiran.github.io/drill/docs/data-type-conversion/#casting-intervals">More examples</a></td>
+ <td valign="top">'1-2' year to month<br><a href="http://apache.github.io/drill/docs/data-type-conversion/#casting-intervals">More examples</a></td>
</tr>
<tr>
<td valign="top">SMALLINT**</td>
@@ -68,12 +68,12 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
<tr>
<td valign="top">TIME</td>
<td valign="top">24-hour based time before or after January 1, 2001 in hours, minutes, seconds format: HH:mm:ss</td>
- <td valign="top">22:55:55.23<br><a href="http://tshiran.github.io/drill/docs/date-time-and-timestamp/">More examples</a></td>
+ <td valign="top">22:55:55.23<br><a href="http://apache.github.io/drill/docs/date-time-and-timestamp/">More examples</a></td>
</tr>
<tr>
<td valign="top">TIMESTAMP</td>
<td valign="top">JDBC timestamp in year, month, date hour, minute, second, and optional milliseconds format: yyyy-MM-dd HH:mm:ss.SSS</td>
- <td valign="top">2015-12-30 22:55:55.23<br> <a href="http://tshiran.github.io/drill/docs/date-time-and-timestamp/">More examples</a></td>
+ <td valign="top">2015-12-30 22:55:55.23<br> <a href="http://apache.github.io/drill/docs/date-time-and-timestamp/">More examples</a></td>
</tr>
<tr>
<td valign="top">CHARACTER VARYING, CHARACTER, CHAR, or VARCHAR***</td>
http://git-wip-us.apache.org/repos/asf/drill/blob/d6fcfbe5/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
index 8534469..a9118d7 100644
--- a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
+++ b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
@@ -20,7 +20,7 @@ Drill includes SQLLine, a JDBC utility for connecting to relational databases an
In distributed mode, [Warden](http://doc.mapr.com/display/MapR/Apache+Drill+Installation+Overview) attempts to start Drill automatically when Drill is defined as service.
-[Starting SQLLine outside the sandbox]({{ site.baseurl }}/docs/starting-stopping-drill) for use with Drill requires entering more options than are shown here. When you type sqlline on the Sandbox command line, a script runs that includes startup options shown in the section, ["Starting/Stopping Drill"](http://tshiran.github.io/drill/docs/starting-stopping-drill/#invoking-sqlline/connecting-to-a-schema).
+[Starting SQLLine outside the sandbox]({{ site.baseurl }}/docs/starting-stopping-drill) for use with Drill requires entering more options than are shown here. When you type sqlline on the Sandbox command line, a script runs that includes startup options shown in the section, ["Starting/Stopping Drill"](http://apache.github.io/drill/docs/starting-stopping-drill/#invoking-sqlline/connecting-to-a-schema).
In this tutorial you query a number of data sets, including Hive and HBase, and files on the file system, such as CSV, JSON, and Parquet files. To access these diverse data sources, you connect Drill to storage plugins.
[08/17] drill git commit: fix links wiki > drill site
Posted by ts...@apache.org.
fix links wiki > drill site
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/850355f2
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/850355f2
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/850355f2
Branch: refs/heads/gh-pages
Commit: 850355f2565ccbdfd40fec945b77d540af67dcca
Parents: 4564fbe
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 14:08:23 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 14:08:23 2015 -0700
----------------------------------------------------------------------
community.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/850355f2/community.html
----------------------------------------------------------------------
diff --git a/community.html b/community.html
index 4fb2389..617eebe 100755
--- a/community.html
+++ b/community.html
@@ -159,8 +159,8 @@ title: Community
<h2>Get Involved</h2>
<p>
- <a rel="nofollow" href="https://cwiki.apache.org/confluence/display/DRILL/Contributing" target="_blank">How to contribute to Drill</a><br>
- <a rel="nofollow" href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+Contribution+Ideas" target="_blank">Contribution Ideas</a><br>
+ <a rel="nofollow" href="http://apache.github.io/drill/docs/apache-drill-contribution-guidelines/#how-to-contribute-to-drill="_blank">How to contribute to Drill</a><br>
+ <a rel="nofollow" href="http://apache.github.io/drill/docs/apache-drill-contribution-ideas/" target="_blank">Contribution Ideas</a><br>
<a rel="nofollow" href="https://plus.google.com/hangouts/_/event/ci4rdiju8bv04a64efj5fedd0lc" target="_blank">Monthly Google Hangout - First Tuesday of each month 10:00am PDT</a><br>
Twitter: <a rel="nofollow" href="https://twitter.com/ApacheDrill" target="_blank">@ApacheDrill</a><br>
Wiki: <a rel="nofollow" href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+Wiki" target="_blank">Apache Drill Wiki</a><br>
[16/17] drill git commit: Merge branch 'dk-gh-pages-4_27_2015' of
https://github.com/testapachedrill/drill into gh-pages
Posted by ts...@apache.org.
Merge branch 'dk-gh-pages-4_27_2015' of https://github.com/testapachedrill/drill into gh-pages
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/884a7d13
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/884a7d13
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/884a7d13
Branch: refs/heads/gh-pages
Commit: 884a7d138a507de7d492cb2bd967875969fb0614
Parents: 6ed707b 906611d
Author: Tomer Shiran <ts...@gmail.com>
Authored: Fri May 1 23:24:00 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Fri May 1 23:24:00 2015 -0700
----------------------------------------------------------------------
_includes/doctoc.html | 2 +-
_includes/menu.html | 4 ++--
_layouts/docpage.html | 19 ++-----------------
_layouts/post.html | 4 +++-
css/docpage.css | 8 +++++---
css/responsive.css | 1 +
6 files changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/884a7d13/_includes/menu.html
----------------------------------------------------------------------
[07/17] drill git commit: multitenant
Posted by ts...@apache.org.
multitenant
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/4564fbe8
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/4564fbe8
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/4564fbe8
Branch: refs/heads/gh-pages
Commit: 4564fbe8326fc5fc59b3cf728cb7a7a8d5245d9c
Parents: d56fcb4
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 11:58:24 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 11:58:24 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 318 +++++++++----------
.../012-configuring-a-multitenant-cluster.md | 5 +
.../012-configuring-different-workloads.md | 5 -
...guring-a-multitenant-cluster-introduction.md | 22 ++
...nfiguring-dfferent-workloads-introduction.md | 22 --
.../015-configuring-drill-in-a-cluster.md | 80 -----
.../015-configuring-multitenant-resources.md | 80 +++++
...-configuring-resources-in-a-mixed-cluster.md | 80 -----
.../017-configuring-a-shared-drillbit.md | 2 +-
9 files changed, 267 insertions(+), 347 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 83fb2b4..dff944f 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -835,7 +835,66 @@
"title": "Configuring Connections on Windows",
"url": "/docs/configuring-connections-on-windows/"
},
- "Configuring Different Workloads": {
+ "Configuring Drill in a Dedicated Cluster": {
+ "breadcrumbs": [
+ {
+ "title": "Manage Drill",
+ "url": "/docs/manage-drill/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring a Multitenant Cluster",
+ "next_url": "/docs/configuring-a-multitenant-cluster/",
+ "parent": "Manage Drill",
+ "previous_title": "Manage Drill Introduction",
+ "previous_url": "/docs/manage-drill-introduction/",
+ "relative_path": "_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md",
+ "title": "Configuring Drill in a Dedicated Cluster",
+ "url": "/docs/configuring-drill-in-a-dedicated-cluster/"
+ },
+ "Configuring Multitenant Resources": {
+ "breadcrumbs": [
+ {
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
+ },
+ {
+ "title": "Manage Drill",
+ "url": "/docs/manage-drill/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring Resources for a Shared Drillbit",
+ "next_url": "/docs/configuring-resources-for-a-shared-drillbit/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster Introduction",
+ "previous_url": "/docs/configuring-a-multitenant-cluster-introduction/",
+ "relative_path": "_docs/manage-drill/015-configuring-multitenant-resources.md",
+ "title": "Configuring Multitenant Resources",
+ "url": "/docs/configuring-multitenant-resources/"
+ },
+ "Configuring Resources for a Shared Drillbit": {
+ "breadcrumbs": [
+ {
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
+ },
+ {
+ "title": "Manage Drill",
+ "url": "/docs/manage-drill/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuration Options",
+ "next_url": "/docs/configuration-options/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring Multitenant Resources",
+ "previous_url": "/docs/configuring-multitenant-resources/",
+ "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
+ "title": "Configuring Resources for a Shared Drillbit",
+ "url": "/docs/configuring-resources-for-a-shared-drillbit/"
+ },
+ "Configuring a Multitenant Cluster": {
"breadcrumbs": [
{
"title": "Manage Drill",
@@ -846,8 +905,8 @@
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -855,20 +914,20 @@
}
],
"children": [],
- "next_title": "Configuring Resources in a Mixed Cluster",
- "next_url": "/docs/configuring-resources-in-a-mixed-cluster/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads",
- "previous_url": "/docs/configuring-different-workloads/",
- "relative_path": "_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md",
- "title": "Configuring Different Workloads Introduction",
- "url": "/docs/configuring-different-workloads-introduction/"
+ "next_title": "Configuring Multitenant Resources",
+ "next_url": "/docs/configuring-multitenant-resources/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster",
+ "previous_url": "/docs/configuring-a-multitenant-cluster/",
+ "relative_path": "_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md",
+ "title": "Configuring a Multitenant Cluster Introduction",
+ "url": "/docs/configuring-a-multitenant-cluster-introduction/"
},
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -878,18 +937,18 @@
"children": [],
"next_title": "Configuring Resources for a Shared Drillbit",
"next_url": "/docs/configuring-resources-for-a-shared-drillbit/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads Introduction",
- "previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
- "title": "Configuring Resources in a Mixed Cluster",
- "url": "/docs/configuring-resources-in-a-mixed-cluster/"
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster Introduction",
+ "previous_url": "/docs/configuring-a-multitenant-cluster-introduction/",
+ "relative_path": "_docs/manage-drill/015-configuring-multitenant-resources.md",
+ "title": "Configuring Multitenant Resources",
+ "url": "/docs/configuring-multitenant-resources/"
},
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -899,28 +958,28 @@
"children": [],
"next_title": "Configuration Options",
"next_url": "/docs/configuration-options/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Resources in a Mixed Cluster",
- "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring Multitenant Resources",
+ "previous_url": "/docs/configuring-multitenant-resources/",
"relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
"title": "Configuring Resources for a Shared Drillbit",
"url": "/docs/configuring-resources-for-a-shared-drillbit/"
}
],
- "next_title": "Configuring Different Workloads Introduction",
- "next_url": "/docs/configuring-different-workloads-introduction/",
+ "next_title": "Configuring a Multitenant Cluster Introduction",
+ "next_url": "/docs/configuring-a-multitenant-cluster-introduction/",
"parent": "Manage Drill",
"previous_title": "Configuring Drill in a Dedicated Cluster",
"previous_url": "/docs/configuring-drill-in-a-dedicated-cluster/",
- "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md",
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "relative_path": "_docs/manage-drill/012-configuring-a-multitenant-cluster.md",
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
- "Configuring Different Workloads Introduction": {
+ "Configuring a Multitenant Cluster Introduction": {
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -928,73 +987,14 @@
}
],
"children": [],
- "next_title": "Configuring Resources in a Mixed Cluster",
- "next_url": "/docs/configuring-resources-in-a-mixed-cluster/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads",
- "previous_url": "/docs/configuring-different-workloads/",
- "relative_path": "_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md",
- "title": "Configuring Different Workloads Introduction",
- "url": "/docs/configuring-different-workloads-introduction/"
- },
- "Configuring Drill in a Dedicated Cluster": {
- "breadcrumbs": [
- {
- "title": "Manage Drill",
- "url": "/docs/manage-drill/"
- }
- ],
- "children": [],
- "next_title": "Configuring Different Workloads",
- "next_url": "/docs/configuring-different-workloads/",
- "parent": "Manage Drill",
- "previous_title": "Manage Drill Introduction",
- "previous_url": "/docs/manage-drill-introduction/",
- "relative_path": "_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md",
- "title": "Configuring Drill in a Dedicated Cluster",
- "url": "/docs/configuring-drill-in-a-dedicated-cluster/"
- },
- "Configuring Resources for a Shared Drillbit": {
- "breadcrumbs": [
- {
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
- },
- {
- "title": "Manage Drill",
- "url": "/docs/manage-drill/"
- }
- ],
- "children": [],
- "next_title": "Configuration Options",
- "next_url": "/docs/configuration-options/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Resources in a Mixed Cluster",
- "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/",
- "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
- "title": "Configuring Resources for a Shared Drillbit",
- "url": "/docs/configuring-resources-for-a-shared-drillbit/"
- },
- "Configuring Resources in a Mixed Cluster": {
- "breadcrumbs": [
- {
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
- },
- {
- "title": "Manage Drill",
- "url": "/docs/manage-drill/"
- }
- ],
- "children": [],
- "next_title": "Configuring Resources for a Shared Drillbit",
- "next_url": "/docs/configuring-resources-for-a-shared-drillbit/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads Introduction",
- "previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
- "title": "Configuring Resources in a Mixed Cluster",
- "url": "/docs/configuring-resources-in-a-mixed-cluster/"
+ "next_title": "Configuring Multitenant Resources",
+ "next_url": "/docs/configuring-multitenant-resources/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster",
+ "previous_url": "/docs/configuring-a-multitenant-cluster/",
+ "relative_path": "_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md",
+ "title": "Configuring a Multitenant Cluster Introduction",
+ "url": "/docs/configuring-a-multitenant-cluster-introduction/"
},
"Connect a Data Source": {
"breadcrumbs": [],
@@ -3475,8 +3475,8 @@
}
],
"children": [],
- "next_title": "Configuring Different Workloads",
- "next_url": "/docs/configuring-different-workloads/",
+ "next_title": "Configuring a Multitenant Cluster",
+ "next_url": "/docs/configuring-a-multitenant-cluster/",
"parent": "Manage Drill",
"previous_title": "Manage Drill Introduction",
"previous_url": "/docs/manage-drill-introduction/",
@@ -3495,8 +3495,8 @@
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -3504,20 +3504,20 @@
}
],
"children": [],
- "next_title": "Configuring Resources in a Mixed Cluster",
- "next_url": "/docs/configuring-resources-in-a-mixed-cluster/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads",
- "previous_url": "/docs/configuring-different-workloads/",
- "relative_path": "_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md",
- "title": "Configuring Different Workloads Introduction",
- "url": "/docs/configuring-different-workloads-introduction/"
+ "next_title": "Configuring Multitenant Resources",
+ "next_url": "/docs/configuring-multitenant-resources/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster",
+ "previous_url": "/docs/configuring-a-multitenant-cluster/",
+ "relative_path": "_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md",
+ "title": "Configuring a Multitenant Cluster Introduction",
+ "url": "/docs/configuring-a-multitenant-cluster-introduction/"
},
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -3527,18 +3527,18 @@
"children": [],
"next_title": "Configuring Resources for a Shared Drillbit",
"next_url": "/docs/configuring-resources-for-a-shared-drillbit/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads Introduction",
- "previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
- "title": "Configuring Resources in a Mixed Cluster",
- "url": "/docs/configuring-resources-in-a-mixed-cluster/"
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster Introduction",
+ "previous_url": "/docs/configuring-a-multitenant-cluster-introduction/",
+ "relative_path": "_docs/manage-drill/015-configuring-multitenant-resources.md",
+ "title": "Configuring Multitenant Resources",
+ "url": "/docs/configuring-multitenant-resources/"
},
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -3548,22 +3548,22 @@
"children": [],
"next_title": "Configuration Options",
"next_url": "/docs/configuration-options/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Resources in a Mixed Cluster",
- "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring Multitenant Resources",
+ "previous_url": "/docs/configuring-multitenant-resources/",
"relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
"title": "Configuring Resources for a Shared Drillbit",
"url": "/docs/configuring-resources-for-a-shared-drillbit/"
}
],
- "next_title": "Configuring Different Workloads Introduction",
- "next_url": "/docs/configuring-different-workloads-introduction/",
+ "next_title": "Configuring a Multitenant Cluster Introduction",
+ "next_url": "/docs/configuring-a-multitenant-cluster-introduction/",
"parent": "Manage Drill",
"previous_title": "Configuring Drill in a Dedicated Cluster",
"previous_url": "/docs/configuring-drill-in-a-dedicated-cluster/",
- "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md",
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "relative_path": "_docs/manage-drill/012-configuring-a-multitenant-cluster.md",
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"breadcrumbs": [
@@ -10903,8 +10903,8 @@
}
],
"children": [],
- "next_title": "Configuring Different Workloads",
- "next_url": "/docs/configuring-different-workloads/",
+ "next_title": "Configuring a Multitenant Cluster",
+ "next_url": "/docs/configuring-a-multitenant-cluster/",
"parent": "Manage Drill",
"previous_title": "Manage Drill Introduction",
"previous_url": "/docs/manage-drill-introduction/",
@@ -10923,8 +10923,8 @@
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -10932,20 +10932,20 @@
}
],
"children": [],
- "next_title": "Configuring Resources in a Mixed Cluster",
- "next_url": "/docs/configuring-resources-in-a-mixed-cluster/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads",
- "previous_url": "/docs/configuring-different-workloads/",
- "relative_path": "_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md",
- "title": "Configuring Different Workloads Introduction",
- "url": "/docs/configuring-different-workloads-introduction/"
+ "next_title": "Configuring Multitenant Resources",
+ "next_url": "/docs/configuring-multitenant-resources/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster",
+ "previous_url": "/docs/configuring-a-multitenant-cluster/",
+ "relative_path": "_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md",
+ "title": "Configuring a Multitenant Cluster Introduction",
+ "url": "/docs/configuring-a-multitenant-cluster-introduction/"
},
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -10955,18 +10955,18 @@
"children": [],
"next_title": "Configuring Resources for a Shared Drillbit",
"next_url": "/docs/configuring-resources-for-a-shared-drillbit/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Different Workloads Introduction",
- "previous_url": "/docs/configuring-different-workloads-introduction/",
- "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md",
- "title": "Configuring Resources in a Mixed Cluster",
- "url": "/docs/configuring-resources-in-a-mixed-cluster/"
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring a Multitenant Cluster Introduction",
+ "previous_url": "/docs/configuring-a-multitenant-cluster-introduction/",
+ "relative_path": "_docs/manage-drill/015-configuring-multitenant-resources.md",
+ "title": "Configuring Multitenant Resources",
+ "url": "/docs/configuring-multitenant-resources/"
},
{
"breadcrumbs": [
{
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"title": "Manage Drill",
@@ -10976,22 +10976,22 @@
"children": [],
"next_title": "Configuration Options",
"next_url": "/docs/configuration-options/",
- "parent": "Configuring Different Workloads",
- "previous_title": "Configuring Resources in a Mixed Cluster",
- "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/",
+ "parent": "Configuring a Multitenant Cluster",
+ "previous_title": "Configuring Multitenant Resources",
+ "previous_url": "/docs/configuring-multitenant-resources/",
"relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
"title": "Configuring Resources for a Shared Drillbit",
"url": "/docs/configuring-resources-for-a-shared-drillbit/"
}
],
- "next_title": "Configuring Different Workloads Introduction",
- "next_url": "/docs/configuring-different-workloads-introduction/",
+ "next_title": "Configuring a Multitenant Cluster Introduction",
+ "next_url": "/docs/configuring-a-multitenant-cluster-introduction/",
"parent": "Manage Drill",
"previous_title": "Configuring Drill in a Dedicated Cluster",
"previous_url": "/docs/configuring-drill-in-a-dedicated-cluster/",
- "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md",
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
+ "relative_path": "_docs/manage-drill/012-configuring-a-multitenant-cluster.md",
+ "title": "Configuring a Multitenant Cluster",
+ "url": "/docs/configuring-a-multitenant-cluster/"
},
{
"breadcrumbs": [
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/012-configuring-a-multitenant-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/012-configuring-a-multitenant-cluster.md b/_docs/manage-drill/012-configuring-a-multitenant-cluster.md
new file mode 100644
index 0000000..fe72675
--- /dev/null
+++ b/_docs/manage-drill/012-configuring-a-multitenant-cluster.md
@@ -0,0 +1,5 @@
+---
+title: "Configuring a Multitenant Cluster"
+parent: "Manage Drill"
+---
+
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/012-configuring-different-workloads.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/012-configuring-different-workloads.md b/_docs/manage-drill/012-configuring-different-workloads.md
deleted file mode 100644
index 874839e..0000000
--- a/_docs/manage-drill/012-configuring-different-workloads.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Configuring Different Workloads"
-parent: "Manage Drill"
----
-
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md b/_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md
new file mode 100644
index 0000000..978d374
--- /dev/null
+++ b/_docs/manage-drill/013-configuring-a-multitenant-cluster-introduction.md
@@ -0,0 +1,22 @@
+---
+title: "Configuring a Multitenant Cluster Introduction"
+parent: "Configuring a Multitenant Cluster"
+---
+
+Drill supports multiple users sharing a Drillbit. You can also run separate Drillbits running on different nodes in the cluster.
+
+Drill typically runs along side other workloads, including the following:
+
+* Mapreduce
+* Yarn
+* HBase
+* Hive and Pig
+* Spark
+
+You need to plan and configure these resources for use with Drill and other workloads:
+
+* [Memory]({{site.baseurl}}/docs/configuring-multitenant-resources)
+* [CPU]({{site.baseurl}}/docs/configuring-multitenant-resources#how-to-manage-drill-cpu-resources)
+* Disk
+
+Configure, memory, queues, and parallelization when users [share a Drillbit]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
deleted file mode 100644
index 4bd1664..0000000
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: "Configuring Different Workloads Introduction"
-parent: "Configuring Different Workloads"
----
-
-Drill supports multiple users sharing a Drillbit. You can also run separate Drillbits running on different nodes in the cluster.
-
-Drill typically runs along side other workloads, including the following:
-
-* Mapreduce
-* Yarn
-* HBase
-* Hive and Pig
-* Spark
-
-You need to plan and configure these resources for use with Drill and other workloads:
-
-* [Memory]({{site.baseurl}}/docs/configuring-resources-in-a-mixed-cluster)
-* [CPU]({{site.baseurl}}/docs/configuring-resources-in-a-mixed-cluster#how-to-manage-drill-cpu-resources)
-* Disk
-
-Configure, memory, queues, and parallelization when users [share a Drillbit]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
deleted file mode 100644
index 474d123..0000000
--- a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: "Configuring Resources in a Mixed Cluster"
-parent: "Configuring Different Workloads"
----
-Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. To configure resources for Drill in a MapR cluster, modify one or more of the following files in `/opt/mapr/conf/conf.d` that the installation process creates.
-
-* `warden.drill-bits.conf`
-* `warden.nodemanager.conf`
-* `warden.resourcemanager.conf`
-
-Configure Drill memory by modifying `warden.drill-bits.conf` in YARN and non-YARN clusters. Configure other resources by modifying `warden.nodemanager.conf `and `warden.resourcemanager.conf `in a YARN-enabled cluster.
-
-## Configuring Drill Memory in a Mixed Cluster
-
-Add the following lines to the `warden.drill-bits.conf` file to configure memory resources for Drill:
-
- service.heapsize.min=<some value in MB>
- service.heapsize.max=<some value in MB>
- service.heapsize.percent=<a whole number>
-
-The service.heapsize.percent is the percentage of memory for the service bounded by minimum and maximum values.
-
-## Configuring Drill in a YARN-enabled MapR Cluster
-
-To add Drill to a YARN-enabled cluster, change memory resources to suit your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
-
-File system = 20G
-HBase = 20G
-Yarn = 20G
-OS = 8G
-
-If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
-
-{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
-
-YARN consists of two main services:
-
-* ResourceManager
- There is at least one instance in a cluster, more if you configure high availability.
-* NodeManager
- There is one instance per node.
-
-ResourceManager and NodeManager memory in `warden.resourcemanager.conf` and
- `warden.nodemanager.conf` are set to the following defaults.
-
- service.heapsize.min=64
- service.heapsize.max=325
- service.heapsize.percent=2
-
-Change these settings for NodeManager and ResourceManager to reconfigure the total memory required for YARN services to run. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh. The -Xmx option is not set, allowing memory on to grow as needed.
-
-### MapReduce v1 Resources
-
-The following default settings in /opt/mapr/conf/warden.conf control MapReduce v1 memory:
-
- mr1.memory.percent=50
- mr1.cpu.percent=50
- mr1.disk.percent=50
-
-Modify these settings to reconfigure MapReduce v1 resources to suit your application needs, as described in section ["Resource Allocation for Jobs and Applications"](http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications) of the MapR documentation. Remaining memory is given to YARN applications.
-
-
-### MapReduce v2 and other Resources
-
-You configure memory for each service by setting three values in `warden.conf`.
-
- service.command.<servicename>.heapsize.percent
- service.command.<servicename>.heapsize.max
- service.command.<servicename>.heapsize.min
-
-Configure memory for other services in the same manner, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf)
-
-For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
-
-* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
-* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
-* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
-
-## How to Manage Drill CPU Resources
-Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/015-configuring-multitenant-resources.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-multitenant-resources.md b/_docs/manage-drill/015-configuring-multitenant-resources.md
new file mode 100644
index 0000000..9a944e8
--- /dev/null
+++ b/_docs/manage-drill/015-configuring-multitenant-resources.md
@@ -0,0 +1,80 @@
+---
+title: "Configuring Multitenant Resources"
+parent: "Configuring a Multitenant Cluster"
+---
+Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. To configure resources for Drill in a MapR cluster, modify one or more of the following files in `/opt/mapr/conf/conf.d` that the installation process creates.
+
+* `warden.drill-bits.conf`
+* `warden.nodemanager.conf`
+* `warden.resourcemanager.conf`
+
+Configure Drill memory by modifying `warden.drill-bits.conf` in YARN and non-YARN clusters. Configure other resources by modifying `warden.nodemanager.conf `and `warden.resourcemanager.conf `in a YARN-enabled cluster.
+
+## Configuring Drill Memory in a Mixed Cluster
+
+Add the following lines to the `warden.drill-bits.conf` file to configure memory resources for Drill:
+
+ service.heapsize.min=<some value in MB>
+ service.heapsize.max=<some value in MB>
+ service.heapsize.percent=<a whole number>
+
+The service.heapsize.percent is the percentage of memory for the service bounded by minimum and maximum values.
+
+## Configuring Drill in a YARN-enabled MapR Cluster
+
+To add Drill to a YARN-enabled cluster, change memory resources to suit your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
+
+File system = 20G
+HBase = 20G
+Yarn = 20G
+OS = 8G
+
+If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
+
+{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
+
+YARN consists of two main services:
+
+* ResourceManager
+ There is at least one instance in a cluster, more if you configure high availability.
+* NodeManager
+ There is one instance per node.
+
+ResourceManager and NodeManager memory in `warden.resourcemanager.conf` and
+ `warden.nodemanager.conf` are set to the following defaults.
+
+ service.heapsize.min=64
+ service.heapsize.max=325
+ service.heapsize.percent=2
+
+Change these settings for NodeManager and ResourceManager to reconfigure the total memory required for YARN services to run. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh. The -Xmx option is not set, allowing memory on to grow as needed.
+
+### MapReduce v1 Resources
+
+The following default settings in /opt/mapr/conf/warden.conf control MapReduce v1 memory:
+
+ mr1.memory.percent=50
+ mr1.cpu.percent=50
+ mr1.disk.percent=50
+
+Modify these settings to reconfigure MapReduce v1 resources to suit your application needs, as described in section ["Resource Allocation for Jobs and Applications"](http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications) of the MapR documentation. Remaining memory is given to YARN applications.
+
+
+### MapReduce v2 and other Resources
+
+You configure memory for each service by setting three values in `warden.conf`.
+
+ service.command.<servicename>.heapsize.percent
+ service.command.<servicename>.heapsize.max
+ service.command.<servicename>.heapsize.min
+
+Configure memory for other services in the same manner, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf)
+
+For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
+
+* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
+* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
+* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
+
+## How to Manage Drill CPU Resources
+Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md b/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md
deleted file mode 100644
index 474d123..0000000
--- a/_docs/manage-drill/015-configuring-resources-in-a-mixed-cluster.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: "Configuring Resources in a Mixed Cluster"
-parent: "Configuring Different Workloads"
----
-Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. To configure resources for Drill in a MapR cluster, modify one or more of the following files in `/opt/mapr/conf/conf.d` that the installation process creates.
-
-* `warden.drill-bits.conf`
-* `warden.nodemanager.conf`
-* `warden.resourcemanager.conf`
-
-Configure Drill memory by modifying `warden.drill-bits.conf` in YARN and non-YARN clusters. Configure other resources by modifying `warden.nodemanager.conf `and `warden.resourcemanager.conf `in a YARN-enabled cluster.
-
-## Configuring Drill Memory in a Mixed Cluster
-
-Add the following lines to the `warden.drill-bits.conf` file to configure memory resources for Drill:
-
- service.heapsize.min=<some value in MB>
- service.heapsize.max=<some value in MB>
- service.heapsize.percent=<a whole number>
-
-The service.heapsize.percent is the percentage of memory for the service bounded by minimum and maximum values.
-
-## Configuring Drill in a YARN-enabled MapR Cluster
-
-To add Drill to a YARN-enabled cluster, change memory resources to suit your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
-
-File system = 20G
-HBase = 20G
-Yarn = 20G
-OS = 8G
-
-If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
-
-{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
-
-YARN consists of two main services:
-
-* ResourceManager
- There is at least one instance in a cluster, more if you configure high availability.
-* NodeManager
- There is one instance per node.
-
-ResourceManager and NodeManager memory in `warden.resourcemanager.conf` and
- `warden.nodemanager.conf` are set to the following defaults.
-
- service.heapsize.min=64
- service.heapsize.max=325
- service.heapsize.percent=2
-
-Change these settings for NodeManager and ResourceManager to reconfigure the total memory required for YARN services to run. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh. The -Xmx option is not set, allowing memory on to grow as needed.
-
-### MapReduce v1 Resources
-
-The following default settings in /opt/mapr/conf/warden.conf control MapReduce v1 memory:
-
- mr1.memory.percent=50
- mr1.cpu.percent=50
- mr1.disk.percent=50
-
-Modify these settings to reconfigure MapReduce v1 resources to suit your application needs, as described in section ["Resource Allocation for Jobs and Applications"](http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications) of the MapR documentation. Remaining memory is given to YARN applications.
-
-
-### MapReduce v2 and other Resources
-
-You configure memory for each service by setting three values in `warden.conf`.
-
- service.command.<servicename>.heapsize.percent
- service.command.<servicename>.heapsize.max
- service.command.<servicename>.heapsize.min
-
-Configure memory for other services in the same manner, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf)
-
-For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
-
-* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
-* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
-* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
-
-## How to Manage Drill CPU Resources
-Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/4564fbe8/_docs/manage-drill/017-configuring-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
index f28194a..3f83736 100644
--- a/_docs/manage-drill/017-configuring-a-shared-drillbit.md
+++ b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
@@ -1,6 +1,6 @@
---
title: "Configuring Resources for a Shared Drillbit"
-parent: "Configuring Different Workloads"
+parent: "Configuring a Multitenant Cluster"
---
To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization in addition to memory, as described in the previous section.
[13/17] drill git commit: Bob's change
Posted by ts...@apache.org.
Bob's change
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/43a8f391
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/43a8f391
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/43a8f391
Branch: refs/heads/gh-pages
Commit: 43a8f391871acdcdfb1bce5128f1e1d8b653cc83
Parents: 12f520a
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 18:11:57 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 18:11:57 2015 -0700
----------------------------------------------------------------------
.../035-storage-plugin-configuration-introduction.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/43a8f391/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md b/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
index 7a13e3e..7744310 100644
--- a/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
+++ b/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
@@ -1,5 +1,5 @@
---
-title: "Storage Plugin Configuration Introduction"
+title: "Plugin Configuration Introduction"
parent: "Storage Plugin Configuration"
---
When you add or update storage plugin instances on one Drill node in a Drill
[05/17] drill git commit: fix link
Posted by ts...@apache.org.
fix link
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/bcc1bc0c
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/bcc1bc0c
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/bcc1bc0c
Branch: refs/heads/gh-pages
Commit: bcc1bc0c6385a405f0f51036636e3a9fd0c34c7d
Parents: 39626bc
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 11:19:57 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 11:19:57 2015 -0700
----------------------------------------------------------------------
.../013-configuring-dfferent-workloads-introduction.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/bcc1bc0c/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
index 737ef79..efbbb2e 100644
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -16,7 +16,7 @@ Drill typically runs along side other workloads, including the following:
You need to plan and configure these resources for use with Drill and other workloads:
* [Memory]({{site.baseurl}}/docs/configuring-resources-in-a-mixed-cluster)
-* [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-cluster#how-to-manage-drill-cpu-resources)
+* [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-mixed-cluster#how-to-manage-drill-cpu-resources)
* Disk
Configure, memory, queues, and parallelization when users [share a Drillbit]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit).
\ No newline at end of file
[04/17] drill git commit: minor edit
Posted by ts...@apache.org.
minor edit
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/39626bc5
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/39626bc5
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/39626bc5
Branch: refs/heads/gh-pages
Commit: 39626bc509740346098fccfbdd778468916be227
Parents: 12f73de
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 11:17:13 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 11:17:13 2015 -0700
----------------------------------------------------------------------
_docs/manage-drill/015-configuring-drill-in-a-cluster.md | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/39626bc5/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
index 8c71e95..474d123 100644
--- a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
@@ -71,9 +71,10 @@ You configure memory for each service by setting three values in `warden.conf`.
Configure memory for other services in the same manner, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf)
For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
-* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
-* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
-* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
+
+* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
+* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
+* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
## How to Manage Drill CPU Resources
Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file
[14/17] drill git commit: Bob's change
Posted by ts...@apache.org.
Bob's change
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/9aafec22
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/9aafec22
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/9aafec22
Branch: refs/heads/gh-pages
Commit: 9aafec22e602bea66f0469e4c363e564dd541433
Parents: 43a8f39
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 18:16:09 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 18:16:09 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 88 ++++++------
.../035-plugin-configuration-introduction.md | 133 +++++++++++++++++++
...storage-plugin-configuration-introduction.md | 133 -------------------
3 files changed, 177 insertions(+), 177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/9aafec22/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index dff944f..3484ad5 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -1058,9 +1058,9 @@
"parent": "Storage Plugin Configuration",
"previous_title": "Storage Plugin Configuration",
"previous_url": "/docs/storage-plugin-configuration/",
- "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md",
- "title": "Storage Plugin Configuration Introduction",
- "url": "/docs/storage-plugin-configuration-introduction/"
+ "relative_path": "_docs/connect-a-data-source/035-plugin-configuration-introduction.md",
+ "title": "Plugin Configuration Introduction",
+ "url": "/docs/plugin-configuration-introduction/"
},
{
"breadcrumbs": [
@@ -1077,8 +1077,8 @@
"next_title": "File System Storage Plugin",
"next_url": "/docs/file-system-storage-plugin/",
"parent": "Storage Plugin Configuration",
- "previous_title": "Storage Plugin Configuration Introduction",
- "previous_url": "/docs/storage-plugin-configuration-introduction/",
+ "previous_title": "Plugin Configuration Introduction",
+ "previous_url": "/docs/plugin-configuration-introduction/",
"relative_path": "_docs/connect-a-data-source/040-workspaces.md",
"title": "Workspaces",
"url": "/docs/workspaces/"
@@ -1168,8 +1168,8 @@
"url": "/docs/drill-default-input-format/"
}
],
- "next_title": "Storage Plugin Configuration Introduction",
- "next_url": "/docs/storage-plugin-configuration-introduction/",
+ "next_title": "Plugin Configuration Introduction",
+ "next_url": "/docs/plugin-configuration-introduction/",
"parent": "Connect a Data Source",
"previous_title": "Storage Plugin Registration",
"previous_url": "/docs/storage-plugin-registration/",
@@ -4486,6 +4486,27 @@
"title": "Planning and Execution Options",
"url": "/docs/planning-and-execution-options/"
},
+ "Plugin Configuration Introduction": {
+ "breadcrumbs": [
+ {
+ "title": "Storage Plugin Configuration",
+ "url": "/docs/storage-plugin-configuration/"
+ },
+ {
+ "title": "Connect a Data Source",
+ "url": "/docs/connect-a-data-source/"
+ }
+ ],
+ "children": [],
+ "next_title": "Workspaces",
+ "next_url": "/docs/workspaces/",
+ "parent": "Storage Plugin Configuration",
+ "previous_title": "Storage Plugin Configuration",
+ "previous_url": "/docs/storage-plugin-configuration/",
+ "relative_path": "_docs/connect-a-data-source/035-plugin-configuration-introduction.md",
+ "title": "Plugin Configuration Introduction",
+ "url": "/docs/plugin-configuration-introduction/"
+ },
"Ports Used by Drill": {
"breadcrumbs": [
{
@@ -7234,9 +7255,9 @@
"parent": "Storage Plugin Configuration",
"previous_title": "Storage Plugin Configuration",
"previous_url": "/docs/storage-plugin-configuration/",
- "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md",
- "title": "Storage Plugin Configuration Introduction",
- "url": "/docs/storage-plugin-configuration-introduction/"
+ "relative_path": "_docs/connect-a-data-source/035-plugin-configuration-introduction.md",
+ "title": "Plugin Configuration Introduction",
+ "url": "/docs/plugin-configuration-introduction/"
},
{
"breadcrumbs": [
@@ -7253,8 +7274,8 @@
"next_title": "File System Storage Plugin",
"next_url": "/docs/file-system-storage-plugin/",
"parent": "Storage Plugin Configuration",
- "previous_title": "Storage Plugin Configuration Introduction",
- "previous_url": "/docs/storage-plugin-configuration-introduction/",
+ "previous_title": "Plugin Configuration Introduction",
+ "previous_url": "/docs/plugin-configuration-introduction/",
"relative_path": "_docs/connect-a-data-source/040-workspaces.md",
"title": "Workspaces",
"url": "/docs/workspaces/"
@@ -7344,8 +7365,8 @@
"url": "/docs/drill-default-input-format/"
}
],
- "next_title": "Storage Plugin Configuration Introduction",
- "next_url": "/docs/storage-plugin-configuration-introduction/",
+ "next_title": "Plugin Configuration Introduction",
+ "next_url": "/docs/plugin-configuration-introduction/",
"parent": "Connect a Data Source",
"previous_title": "Storage Plugin Registration",
"previous_url": "/docs/storage-plugin-registration/",
@@ -7353,27 +7374,6 @@
"title": "Storage Plugin Configuration",
"url": "/docs/storage-plugin-configuration/"
},
- "Storage Plugin Configuration Introduction": {
- "breadcrumbs": [
- {
- "title": "Storage Plugin Configuration",
- "url": "/docs/storage-plugin-configuration/"
- },
- {
- "title": "Connect a Data Source",
- "url": "/docs/connect-a-data-source/"
- }
- ],
- "children": [],
- "next_title": "Workspaces",
- "next_url": "/docs/workspaces/",
- "parent": "Storage Plugin Configuration",
- "previous_title": "Storage Plugin Configuration",
- "previous_url": "/docs/storage-plugin-configuration/",
- "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md",
- "title": "Storage Plugin Configuration Introduction",
- "url": "/docs/storage-plugin-configuration-introduction/"
- },
"Storage Plugin Registration": {
"breadcrumbs": [
{
@@ -8332,8 +8332,8 @@
"next_title": "File System Storage Plugin",
"next_url": "/docs/file-system-storage-plugin/",
"parent": "Storage Plugin Configuration",
- "previous_title": "Storage Plugin Configuration Introduction",
- "previous_url": "/docs/storage-plugin-configuration-introduction/",
+ "previous_title": "Plugin Configuration Introduction",
+ "previous_url": "/docs/plugin-configuration-introduction/",
"relative_path": "_docs/connect-a-data-source/040-workspaces.md",
"title": "Workspaces",
"url": "/docs/workspaces/"
@@ -8968,9 +8968,9 @@
"parent": "Storage Plugin Configuration",
"previous_title": "Storage Plugin Configuration",
"previous_url": "/docs/storage-plugin-configuration/",
- "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md",
- "title": "Storage Plugin Configuration Introduction",
- "url": "/docs/storage-plugin-configuration-introduction/"
+ "relative_path": "_docs/connect-a-data-source/035-plugin-configuration-introduction.md",
+ "title": "Plugin Configuration Introduction",
+ "url": "/docs/plugin-configuration-introduction/"
},
{
"breadcrumbs": [
@@ -8987,8 +8987,8 @@
"next_title": "File System Storage Plugin",
"next_url": "/docs/file-system-storage-plugin/",
"parent": "Storage Plugin Configuration",
- "previous_title": "Storage Plugin Configuration Introduction",
- "previous_url": "/docs/storage-plugin-configuration-introduction/",
+ "previous_title": "Plugin Configuration Introduction",
+ "previous_url": "/docs/plugin-configuration-introduction/",
"relative_path": "_docs/connect-a-data-source/040-workspaces.md",
"title": "Workspaces",
"url": "/docs/workspaces/"
@@ -9078,8 +9078,8 @@
"url": "/docs/drill-default-input-format/"
}
],
- "next_title": "Storage Plugin Configuration Introduction",
- "next_url": "/docs/storage-plugin-configuration-introduction/",
+ "next_title": "Plugin Configuration Introduction",
+ "next_url": "/docs/plugin-configuration-introduction/",
"parent": "Connect a Data Source",
"previous_title": "Storage Plugin Registration",
"previous_url": "/docs/storage-plugin-registration/",
http://git-wip-us.apache.org/repos/asf/drill/blob/9aafec22/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-plugin-configuration-introduction.md b/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
new file mode 100644
index 0000000..7744310
--- /dev/null
+++ b/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
@@ -0,0 +1,133 @@
+---
+title: "Plugin Configuration Introduction"
+parent: "Storage Plugin Configuration"
+---
+When you add or update storage plugin instances on one Drill node in a Drill
+cluster, Drill broadcasts the information to all of the other Drill nodes
+to have identical storage plugin configurations. You do not need to
+restart any of the Drillbits when you add or update a storage plugin instance.
+
+Use the Drill Web UI to update or add a new storage plugin. Launch a web browser, go to: `http://<IP address of the sandbox>:8047`, and then go to the Storage tab.
+
+To create and configure a new storage plugin:
+
+1. Enter a storage name in New Storage Plugin.
+ Each storage plugin registered with Drill must have a distinct
+name. Names are case-sensitive.
+2. Click Create.
+3. In Configuration, configure attributes of the storage plugin, if applicable, using JSON formatting. The Storage Plugin Attributes table in the next section describes attributes typically reconfigured by users.
+4. Click Create.
+
+Click Update to reconfigure an existing, enabled storage plugin.
+
+## Storage Plugin Attributes
+The following diagram of the dfs storage plugin briefly describes options you configure in a typical storage plugin configuration:
+
+
+
+The following table describes the attributes you configure for storage plugins in more detail than the diagram.
+
+<table>
+ <tr>
+ <th>Attribute</th>
+ <th>Example Values</th>
+ <th>Required</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>"type"</td>
+ <td>"file"<br>"hbase"<br>"hive"<br>"mongo"</td>
+ <td>yes</td>
+ <td>The storage plugin type name supported by Drill.</td>
+ </tr>
+ <tr>
+ <td>"enabled"</td>
+ <td>true<br>false</td>
+ <td>yes</td>
+ <td>The state of the storage plugin.</td>
+ </tr>
+ <tr>
+ <td>"connection"</td>
+ <td>"classpath:///"<br>"file:///"<br>"mongodb://localhost:27017/"<br>"maprfs:///"</td>
+ <td>implementation-dependent</td>
+ <td>The type of distributed file system. Drill can work with any distributed system, such as HDFS and S3, or files in your file system.</td>
+ </tr>
+ <tr>
+ <td>"workspaces"</td>
+ <td>null<br>"logs"</td>
+ <td>no</td>
+ <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
+ </tr>
+ <tr>
+ <td>"workspaces". . . "location"</td>
+ <td>"location": "/"<br>"location": "/tmp"</td>
+ <td>no</td>
+ <td>The path to a directory on the file system.</td>
+ </tr>
+ <tr>
+ <td>"workspaces". . . "writable"</td>
+ <td>true<br>false</td>
+ <td>no</td>
+ <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
+ </tr>
+ <tr>
+ <td>"workspaces". . . "defaultInputFormat"</td>
+ <td>null<br>"parquet"<br>"csv"<br>"json"</td>
+ <td>no</td>
+ <td>The format of data Drill reads by default, regardless of extension. Parquet is the default.</td>
+ </tr>
+ <tr>
+ <td>"formats"</td>
+ <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"maprdb"</td>
+ <td>yes</td>
+ <td>One or more file formats of data Drill can read. Drill can implicitly detect some file formats based on the file extension or the first few bits of data within the file, but you need to configure an option for others.</td>
+ </tr>
+ <tr>
+ <td>"formats" . . . "type"</td>
+ <td>"text"<br>"parquet"<br>"json"<br>"maprdb"</td>
+ <td>yes</td>
+ <td>The type of the format specified. For example, you can define two formats, csv and psv, as type "Text", but having different delimiters. Drill enables the maprdb plugin if you define the maprdb type.</td>
+ </tr>
+ <tr>
+ <td>formats . . . "extensions"</td>
+ <td>["csv"]</td>
+ <td>format-dependent</td>
+ <td>The extensions of the files that Drill can read.</td>
+ </tr>
+ <tr>
+ <td>"formats" . . . "delimiter"</td>
+ <td>"\t"<br>","</td>
+ <td>format-dependent</td>
+ <td>The delimiter used to separate columns in text files such as CSV. Specify a non-printable delimiter in the storage plugin config by using the form \uXXXX, where XXXX is the four numeral hex ascii code for the character.</td>
+ </tr>
+</table>
+
+The configuration of other attributes, such as `size.calculator.enabled` in the hbase plugin and `configProps` in the hive plugin, are implementation-dependent and beyond the scope of this document.
+
+Although Drill can work with different file types in the same directory, restricting a Drill workspace to one file type prevents confusion.
+
+## Case-sensitive Names
+As previously mentioned, workspace and storage plugin names are case-sensitive. For example, the following query uses a storage plugin name `dfs` and a workspace name `clicks`. When you refer to `dfs.clicks` in an SQL statement, use the defined case:
+
+ 0: jdbc:drill:> USE dfs.clicks;
+
+For example, using uppercase letters in the query after defining the storage plugin and workspace names using lowercase letters does not work.
+
+## REST API
+
+Drill provides a REST API that you can use to create a storage plugin. Use an HTTP POST and pass two properties:
+
+* name
+ The plugin name.
+
+* config
+ The storage plugin definition as you would enter it in the Web UI.
+
+For example, this command creates a plugin named myplugin for reading files of an unknown type located on the root of the file system:
+
+ curl -X POST -/json" -d '{"name":"myplugin", "config": {"type": "file", "enabled": false, "connection": "file:///", "workspaces": { "root": { "location": "/", "writable": false, "defaultInputFormat": null}}, "formats": null}}' http://localhost:8047/storage/myplugin.json
+
+## Bootstrapping a Storage Plugin
+If you need to add a storage plugin to Drill and do not want to use a web browser, you can create a [bootstrap-storage-plugins.json](https://github.com/apache/drill/blob/master/contrib/storage-hbase/src/main/resources/bootstrap-storage-plugins.json) file and include it on the classpath when starting Drill. The storage plugin loads when Drill starts up.
+
+If you configure an HBase storage plugin using bootstrap-storage-plugins.json file and HBase is not install, you might experience a delay when executing the queries. Configure the [HBase client timeout](http://hbase.apache.org/book.html#config.files) and retry settings in the config block of HBase plugin instance configuration.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/9aafec22/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md b/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
deleted file mode 100644
index 7744310..0000000
--- a/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
+++ /dev/null
@@ -1,133 +0,0 @@
----
-title: "Plugin Configuration Introduction"
-parent: "Storage Plugin Configuration"
----
-When you add or update storage plugin instances on one Drill node in a Drill
-cluster, Drill broadcasts the information to all of the other Drill nodes
-to have identical storage plugin configurations. You do not need to
-restart any of the Drillbits when you add or update a storage plugin instance.
-
-Use the Drill Web UI to update or add a new storage plugin. Launch a web browser, go to: `http://<IP address of the sandbox>:8047`, and then go to the Storage tab.
-
-To create and configure a new storage plugin:
-
-1. Enter a storage name in New Storage Plugin.
- Each storage plugin registered with Drill must have a distinct
-name. Names are case-sensitive.
-2. Click Create.
-3. In Configuration, configure attributes of the storage plugin, if applicable, using JSON formatting. The Storage Plugin Attributes table in the next section describes attributes typically reconfigured by users.
-4. Click Create.
-
-Click Update to reconfigure an existing, enabled storage plugin.
-
-## Storage Plugin Attributes
-The following diagram of the dfs storage plugin briefly describes options you configure in a typical storage plugin configuration:
-
-
-
-The following table describes the attributes you configure for storage plugins in more detail than the diagram.
-
-<table>
- <tr>
- <th>Attribute</th>
- <th>Example Values</th>
- <th>Required</th>
- <th>Description</th>
- </tr>
- <tr>
- <td>"type"</td>
- <td>"file"<br>"hbase"<br>"hive"<br>"mongo"</td>
- <td>yes</td>
- <td>The storage plugin type name supported by Drill.</td>
- </tr>
- <tr>
- <td>"enabled"</td>
- <td>true<br>false</td>
- <td>yes</td>
- <td>The state of the storage plugin.</td>
- </tr>
- <tr>
- <td>"connection"</td>
- <td>"classpath:///"<br>"file:///"<br>"mongodb://localhost:27017/"<br>"maprfs:///"</td>
- <td>implementation-dependent</td>
- <td>The type of distributed file system. Drill can work with any distributed system, such as HDFS and S3, or files in your file system.</td>
- </tr>
- <tr>
- <td>"workspaces"</td>
- <td>null<br>"logs"</td>
- <td>no</td>
- <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
- </tr>
- <tr>
- <td>"workspaces". . . "location"</td>
- <td>"location": "/"<br>"location": "/tmp"</td>
- <td>no</td>
- <td>The path to a directory on the file system.</td>
- </tr>
- <tr>
- <td>"workspaces". . . "writable"</td>
- <td>true<br>false</td>
- <td>no</td>
- <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
- </tr>
- <tr>
- <td>"workspaces". . . "defaultInputFormat"</td>
- <td>null<br>"parquet"<br>"csv"<br>"json"</td>
- <td>no</td>
- <td>The format of data Drill reads by default, regardless of extension. Parquet is the default.</td>
- </tr>
- <tr>
- <td>"formats"</td>
- <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"maprdb"</td>
- <td>yes</td>
- <td>One or more file formats of data Drill can read. Drill can implicitly detect some file formats based on the file extension or the first few bits of data within the file, but you need to configure an option for others.</td>
- </tr>
- <tr>
- <td>"formats" . . . "type"</td>
- <td>"text"<br>"parquet"<br>"json"<br>"maprdb"</td>
- <td>yes</td>
- <td>The type of the format specified. For example, you can define two formats, csv and psv, as type "Text", but having different delimiters. Drill enables the maprdb plugin if you define the maprdb type.</td>
- </tr>
- <tr>
- <td>formats . . . "extensions"</td>
- <td>["csv"]</td>
- <td>format-dependent</td>
- <td>The extensions of the files that Drill can read.</td>
- </tr>
- <tr>
- <td>"formats" . . . "delimiter"</td>
- <td>"\t"<br>","</td>
- <td>format-dependent</td>
- <td>The delimiter used to separate columns in text files such as CSV. Specify a non-printable delimiter in the storage plugin config by using the form \uXXXX, where XXXX is the four numeral hex ascii code for the character.</td>
- </tr>
-</table>
-
-The configuration of other attributes, such as `size.calculator.enabled` in the hbase plugin and `configProps` in the hive plugin, are implementation-dependent and beyond the scope of this document.
-
-Although Drill can work with different file types in the same directory, restricting a Drill workspace to one file type prevents confusion.
-
-## Case-sensitive Names
-As previously mentioned, workspace and storage plugin names are case-sensitive. For example, the following query uses a storage plugin name `dfs` and a workspace name `clicks`. When you refer to `dfs.clicks` in an SQL statement, use the defined case:
-
- 0: jdbc:drill:> USE dfs.clicks;
-
-For example, using uppercase letters in the query after defining the storage plugin and workspace names using lowercase letters does not work.
-
-## REST API
-
-Drill provides a REST API that you can use to create a storage plugin. Use an HTTP POST and pass two properties:
-
-* name
- The plugin name.
-
-* config
- The storage plugin definition as you would enter it in the Web UI.
-
-For example, this command creates a plugin named myplugin for reading files of an unknown type located on the root of the file system:
-
- curl -X POST -/json" -d '{"name":"myplugin", "config": {"type": "file", "enabled": false, "connection": "file:///", "workspaces": { "root": { "location": "/", "writable": false, "defaultInputFormat": null}}, "formats": null}}' http://localhost:8047/storage/myplugin.json
-
-## Bootstrapping a Storage Plugin
-If you need to add a storage plugin to Drill and do not want to use a web browser, you can create a [bootstrap-storage-plugins.json](https://github.com/apache/drill/blob/master/contrib/storage-hbase/src/main/resources/bootstrap-storage-plugins.json) file and include it on the classpath when starting Drill. The storage plugin loads when Drill starts up.
-
-If you configure an HBase storage plugin using bootstrap-storage-plugins.json file and HBase is not install, you might experience a delay when executing the queries. Configure the [HBase client timeout](http://hbase.apache.org/book.html#config.files) and retry settings in the config block of HBase plugin instance configuration.
\ No newline at end of file
[02/17] drill git commit: minor edit
Posted by ts...@apache.org.
minor edit
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/a9da61ab
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/a9da61ab
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/a9da61ab
Branch: refs/heads/gh-pages
Commit: a9da61ab0bb01c115e14038a9e4e3a056edb6ee0
Parents: 6ed707b
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 11:09:36 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 11:09:36 2015 -0700
----------------------------------------------------------------------
_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/a9da61ab/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md b/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md
index 7a3fc3f..086f207 100644
--- a/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md
+++ b/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md
@@ -3,7 +3,7 @@ title: "Configuring Drill in a Dedicated Cluster"
parent: "Manage Drill"
---
-This section describes how to configure the amount of direct memory allocated to a Drillbit for query processing in a dedicated Drill cluster. When you use Drill in a cluster with other workloads, configure memory as described in section, ["Configuring Resources in a Mixed Cluster"]({{site.baseurl}}/docs/configuring-resources-in-a-cluster).
+This section describes how to configure the amount of direct memory allocated to a Drillbit for query processing in a dedicated Drill cluster. When you use Drill in a cluster with other workloads, configure memory as described in section, ["Configuring Resources in a Mixed Cluster"]({{site.baseurl}}/docs/configuring-resources-in-a-mixed-cluster).
The default memory for a Drillbit is 8G, but Drill prefers 16G or more
depending on the workload. The total amount of direct memory that a Drillbit