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/01 20:08:40 UTC
[44/50] [abbrv] drill git commit: diff workloads
diff workloads
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/53a424ad
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/53a424ad
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/53a424ad
Branch: refs/heads/gh-pages
Commit: 53a424ad617e2d04b8691f925372a4b6ab864c6f
Parents: 3249804
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 18:42:29 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 18:42:29 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 300 +++++++++++++------
_docs/manage-drill/011-configuring-memory.md | 12 +-
...nfiguring-dfferent-workloads-introduction.md | 8 +-
.../015-configuring-drill-in-a-cluster.md | 59 ++--
.../015-configuring-resources-in-a-cluster.md | 78 +++++
.../017-configuring-a-shared-drillbit.md | 2 +-
...nfiguring-resources-for-a-shared-drillbit.md | 65 ++++
7 files changed, 399 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 4efa490..6cc9b8d 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -766,8 +766,8 @@
"next_title": "Configuration Options Introduction",
"next_url": "/docs/configuration-options-introduction/",
"parent": "Manage Drill",
- "previous_title": "Configuring a Shared Drillbit",
- "previous_url": "/docs/configuring-a-shared-drillbit/",
+ "previous_title": "Configuring Resources for a Shared Drillbit",
+ "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/",
"relative_path": "_docs/manage-drill/020-configuration-options.md",
"title": "Configuration Options",
"url": "/docs/configuration-options/"
@@ -855,8 +855,8 @@
}
],
"children": [],
- "next_title": "Configuring Drill in a Cluster",
- "next_url": "/docs/configuring-drill-in-a-cluster/",
+ "next_title": "Configuring Resources in a Cluster",
+ "next_url": "/docs/configuring-resources-in-a-cluster/",
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads",
"previous_url": "/docs/configuring-different-workloads/",
@@ -876,14 +876,56 @@
}
],
"children": [],
- "next_title": "Configuring a Shared Drillbit",
- "next_url": "/docs/configuring-a-shared-drillbit/",
+ "next_title": "Configuring Resources in a Cluster",
+ "next_url": "/docs/configuring-resources-in-a-cluster/",
"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",
- "title": "Configuring Drill in a Cluster",
- "url": "/docs/configuring-drill-in-a-cluster/"
+ "title": "Configuring Resources in a Cluster",
+ "url": "/docs/configuring-resources-in-a-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 Resources in a Cluster",
+ "previous_url": "/docs/configuring-resources-in-a-cluster/",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md",
+ "title": "Configuring Resources in a Cluster",
+ "url": "/docs/configuring-resources-in-a-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 Resources in a Cluster",
+ "previous_url": "/docs/configuring-resources-in-a-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/"
},
{
"breadcrumbs": [
@@ -900,18 +942,18 @@
"next_title": "Configuration Options",
"next_url": "/docs/configuration-options/",
"parent": "Configuring Different Workloads",
- "previous_title": "Configuring Drill in a Cluster",
- "previous_url": "/docs/configuring-drill-in-a-cluster/",
- "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
- "title": "Configuring a Shared Drillbit",
- "url": "/docs/configuring-a-shared-drillbit/"
+ "previous_title": "Configuring Resources for a Shared Drillbit",
+ "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/",
+ "relative_path": "_docs/manage-drill/017-configuring-resources-for-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/",
"parent": "Manage Drill",
- "previous_title": "Configuring Memory for Drill",
- "previous_url": "/docs/configuring-memory-for-drill/",
+ "previous_title": "Configuring Memory for Drill in a Drill cluster",
+ "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/",
"relative_path": "_docs/manage-drill/012-configuring-different-workloads.md",
"title": "Configuring Different Workloads",
"url": "/docs/configuring-different-workloads/"
@@ -928,8 +970,8 @@
}
],
"children": [],
- "next_title": "Configuring Drill in a Cluster",
- "next_url": "/docs/configuring-drill-in-a-cluster/",
+ "next_title": "Configuring Resources in a Cluster",
+ "next_url": "/docs/configuring-resources-in-a-cluster/",
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads",
"previous_url": "/docs/configuring-different-workloads/",
@@ -937,28 +979,7 @@
"title": "Configuring Different Workloads Introduction",
"url": "/docs/configuring-different-workloads-introduction/"
},
- "Configuring Drill in a Cluster": {
- "breadcrumbs": [
- {
- "title": "Configuring Different Workloads",
- "url": "/docs/configuring-different-workloads/"
- },
- {
- "title": "Manage Drill",
- "url": "/docs/manage-drill/"
- }
- ],
- "children": [],
- "next_title": "Configuring a Shared Drillbit",
- "next_url": "/docs/configuring-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-drill-in-a-cluster.md",
- "title": "Configuring Drill in a Cluster",
- "url": "/docs/configuring-drill-in-a-cluster/"
- },
- "Configuring Memory for Drill": {
+ "Configuring Memory for Drill in a Drill cluster": {
"breadcrumbs": [
{
"title": "Manage Drill",
@@ -972,10 +993,10 @@
"previous_title": "Manage Drill Introduction",
"previous_url": "/docs/manage-drill-introduction/",
"relative_path": "_docs/manage-drill/011-configuring-memory.md",
- "title": "Configuring Memory for Drill",
- "url": "/docs/configuring-memory-for-drill/"
+ "title": "Configuring Memory for Drill in a Drill cluster",
+ "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
},
- "Configuring a Shared Drillbit": {
+ "Configuring Resources for a Shared Drillbit": {
"breadcrumbs": [
{
"title": "Configuring Different Workloads",
@@ -990,11 +1011,32 @@
"next_title": "Configuration Options",
"next_url": "/docs/configuration-options/",
"parent": "Configuring Different Workloads",
- "previous_title": "Configuring Drill in a Cluster",
- "previous_url": "/docs/configuring-drill-in-a-cluster/",
- "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
- "title": "Configuring a Shared Drillbit",
- "url": "/docs/configuring-a-shared-drillbit/"
+ "previous_title": "Configuring Resources for a Shared Drillbit",
+ "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/",
+ "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md",
+ "title": "Configuring Resources for a Shared Drillbit",
+ "url": "/docs/configuring-resources-for-a-shared-drillbit/"
+ },
+ "Configuring Resources in a 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 Resources in a Cluster",
+ "previous_url": "/docs/configuring-resources-in-a-cluster/",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md",
+ "title": "Configuring Resources in a Cluster",
+ "url": "/docs/configuring-resources-in-a-cluster/"
},
"Connect a Data Source": {
"breadcrumbs": [],
@@ -3458,8 +3500,8 @@
}
],
"children": [],
- "next_title": "Configuring Memory for Drill",
- "next_url": "/docs/configuring-memory-for-drill/",
+ "next_title": "Configuring Memory for Drill in a Drill cluster",
+ "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/",
"parent": "Manage Drill",
"previous_title": "Manage Drill",
"previous_url": "/docs/manage-drill/",
@@ -3481,8 +3523,8 @@
"previous_title": "Manage Drill Introduction",
"previous_url": "/docs/manage-drill-introduction/",
"relative_path": "_docs/manage-drill/011-configuring-memory.md",
- "title": "Configuring Memory for Drill",
- "url": "/docs/configuring-memory-for-drill/"
+ "title": "Configuring Memory for Drill in a Drill cluster",
+ "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
},
{
"breadcrumbs": [
@@ -3504,8 +3546,8 @@
}
],
"children": [],
- "next_title": "Configuring Drill in a Cluster",
- "next_url": "/docs/configuring-drill-in-a-cluster/",
+ "next_title": "Configuring Resources in a Cluster",
+ "next_url": "/docs/configuring-resources-in-a-cluster/",
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads",
"previous_url": "/docs/configuring-different-workloads/",
@@ -3525,14 +3567,56 @@
}
],
"children": [],
- "next_title": "Configuring a Shared Drillbit",
- "next_url": "/docs/configuring-a-shared-drillbit/",
+ "next_title": "Configuring Resources in a Cluster",
+ "next_url": "/docs/configuring-resources-in-a-cluster/",
"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",
- "title": "Configuring Drill in a Cluster",
- "url": "/docs/configuring-drill-in-a-cluster/"
+ "title": "Configuring Resources in a Cluster",
+ "url": "/docs/configuring-resources-in-a-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 Resources in a Cluster",
+ "previous_url": "/docs/configuring-resources-in-a-cluster/",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md",
+ "title": "Configuring Resources in a Cluster",
+ "url": "/docs/configuring-resources-in-a-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 Resources in a Cluster",
+ "previous_url": "/docs/configuring-resources-in-a-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/"
},
{
"breadcrumbs": [
@@ -3549,18 +3633,18 @@
"next_title": "Configuration Options",
"next_url": "/docs/configuration-options/",
"parent": "Configuring Different Workloads",
- "previous_title": "Configuring Drill in a Cluster",
- "previous_url": "/docs/configuring-drill-in-a-cluster/",
- "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
- "title": "Configuring a Shared Drillbit",
- "url": "/docs/configuring-a-shared-drillbit/"
+ "previous_title": "Configuring Resources for a Shared Drillbit",
+ "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/",
+ "relative_path": "_docs/manage-drill/017-configuring-resources-for-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/",
"parent": "Manage Drill",
- "previous_title": "Configuring Memory for Drill",
- "previous_url": "/docs/configuring-memory-for-drill/",
+ "previous_title": "Configuring Memory for Drill in a Drill cluster",
+ "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/",
"relative_path": "_docs/manage-drill/012-configuring-different-workloads.md",
"title": "Configuring Different Workloads",
"url": "/docs/configuring-different-workloads/"
@@ -3661,8 +3745,8 @@
"next_title": "Configuration Options Introduction",
"next_url": "/docs/configuration-options-introduction/",
"parent": "Manage Drill",
- "previous_title": "Configuring a Shared Drillbit",
- "previous_url": "/docs/configuring-a-shared-drillbit/",
+ "previous_title": "Configuring Resources for a Shared Drillbit",
+ "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/",
"relative_path": "_docs/manage-drill/020-configuration-options.md",
"title": "Configuration Options",
"url": "/docs/configuration-options/"
@@ -3753,8 +3837,8 @@
}
],
"children": [],
- "next_title": "Configuring Memory for Drill",
- "next_url": "/docs/configuring-memory-for-drill/",
+ "next_title": "Configuring Memory for Drill in a Drill cluster",
+ "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/",
"parent": "Manage Drill",
"previous_title": "Manage Drill",
"previous_url": "/docs/manage-drill/",
@@ -10886,8 +10970,8 @@
}
],
"children": [],
- "next_title": "Configuring Memory for Drill",
- "next_url": "/docs/configuring-memory-for-drill/",
+ "next_title": "Configuring Memory for Drill in a Drill cluster",
+ "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/",
"parent": "Manage Drill",
"previous_title": "Manage Drill",
"previous_url": "/docs/manage-drill/",
@@ -10909,8 +10993,8 @@
"previous_title": "Manage Drill Introduction",
"previous_url": "/docs/manage-drill-introduction/",
"relative_path": "_docs/manage-drill/011-configuring-memory.md",
- "title": "Configuring Memory for Drill",
- "url": "/docs/configuring-memory-for-drill/"
+ "title": "Configuring Memory for Drill in a Drill cluster",
+ "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
},
{
"breadcrumbs": [
@@ -10932,8 +11016,8 @@
}
],
"children": [],
- "next_title": "Configuring Drill in a Cluster",
- "next_url": "/docs/configuring-drill-in-a-cluster/",
+ "next_title": "Configuring Resources in a Cluster",
+ "next_url": "/docs/configuring-resources-in-a-cluster/",
"parent": "Configuring Different Workloads",
"previous_title": "Configuring Different Workloads",
"previous_url": "/docs/configuring-different-workloads/",
@@ -10953,14 +11037,56 @@
}
],
"children": [],
- "next_title": "Configuring a Shared Drillbit",
- "next_url": "/docs/configuring-a-shared-drillbit/",
+ "next_title": "Configuring Resources in a Cluster",
+ "next_url": "/docs/configuring-resources-in-a-cluster/",
"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",
- "title": "Configuring Drill in a Cluster",
- "url": "/docs/configuring-drill-in-a-cluster/"
+ "title": "Configuring Resources in a Cluster",
+ "url": "/docs/configuring-resources-in-a-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 Resources in a Cluster",
+ "previous_url": "/docs/configuring-resources-in-a-cluster/",
+ "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md",
+ "title": "Configuring Resources in a Cluster",
+ "url": "/docs/configuring-resources-in-a-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 Resources in a Cluster",
+ "previous_url": "/docs/configuring-resources-in-a-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/"
},
{
"breadcrumbs": [
@@ -10977,18 +11103,18 @@
"next_title": "Configuration Options",
"next_url": "/docs/configuration-options/",
"parent": "Configuring Different Workloads",
- "previous_title": "Configuring Drill in a Cluster",
- "previous_url": "/docs/configuring-drill-in-a-cluster/",
- "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md",
- "title": "Configuring a Shared Drillbit",
- "url": "/docs/configuring-a-shared-drillbit/"
+ "previous_title": "Configuring Resources for a Shared Drillbit",
+ "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/",
+ "relative_path": "_docs/manage-drill/017-configuring-resources-for-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/",
"parent": "Manage Drill",
- "previous_title": "Configuring Memory for Drill",
- "previous_url": "/docs/configuring-memory-for-drill/",
+ "previous_title": "Configuring Memory for Drill in a Drill cluster",
+ "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/",
"relative_path": "_docs/manage-drill/012-configuring-different-workloads.md",
"title": "Configuring Different Workloads",
"url": "/docs/configuring-different-workloads/"
@@ -11089,8 +11215,8 @@
"next_title": "Configuration Options Introduction",
"next_url": "/docs/configuration-options-introduction/",
"parent": "Manage Drill",
- "previous_title": "Configuring a Shared Drillbit",
- "previous_url": "/docs/configuring-a-shared-drillbit/",
+ "previous_title": "Configuring Resources for a Shared Drillbit",
+ "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/",
"relative_path": "_docs/manage-drill/020-configuration-options.md",
"title": "Configuration Options",
"url": "/docs/configuration-options/"
http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/011-configuring-memory.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/011-configuring-memory.md b/_docs/manage-drill/011-configuring-memory.md
index 68c2bf0..f1921d3 100644
--- a/_docs/manage-drill/011-configuring-memory.md
+++ b/_docs/manage-drill/011-configuring-memory.md
@@ -1,10 +1,11 @@
---
-title: "Configuring Memory for Drill"
+title: "Configuring Memory for Drill in a Drill cluster"
parent: "Manage Drill"
---
-You can configure the amount of direct memory allocated to a Drillbit for
-query processing. The default limit is 8G, but Drill prefers 16G or more
+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 Cluster"]({{site.baseurl}}/docs/configuring-resources-in-a-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
allocates to query operations cannot exceed the limit set.
@@ -26,7 +27,4 @@ env.sh`.
{% include startnote.html %}If this parameter is not set, the limit depends on the amount of available system memory.{% include endnote.html %}
-After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart
-the Drillbit
-]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit)on
-the node.
\ No newline at end of file
+After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart the Drillbit]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit) onthe node.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_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 29b830c..ce1f1a6 100644
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -3,7 +3,7 @@ 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 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:
@@ -15,8 +15,8 @@ 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-memory)
-* [CPU]({{site.baseurl}}/docs/how-to-manage-drill-cpu-resources)
+* [Memory]({{site.baseurl}}/docs/configuring-resources-in-a-cluster)
+* [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-cluster#how-to-manage-drill-cpu-resources)
* Disk
-["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for sharing a drillbit and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for drillbits running on different nodes in the cluster.
\ No newline at end of file
+["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for sharing a drillbit and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for Drillbits running on different nodes in the cluster.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_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 11e4747..4ec1cf4 100644
--- a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
@@ -1,62 +1,69 @@
---
-title: "Configuring Drill in a Cluster"
+title: "Configuring Resources in a 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 reserve memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node.
+## Configuring Drill Memory in a Cluster with other Workloads
+
+To configure memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node.
[root@centos23 conf.d]# pwd
/opt/mapr/conf/conf.d
[root@centos23 conf.d]# ls
warden.drill-bits.conf warden.nodemanager.conf warden.resourcemanager.conf
-You add the following lines to the file:
+You add the following lines to the wardens.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=<some whole number value>
+ service.heapsize.percent=<a whole number>
+
+This service.heapsize.percent is the percentage of memory for the service bounded by min and max values.
## Configuring Drill in a YARN-enabled MapR Cluster
-For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
+To add Drill to a YARN-enabled cluster, you change memory resources depending on 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
-To add Drill to the cluster, how do you change memory allocation? It depends on your application. 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.
+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 2 main services ResourceManager(one instance in cluster, more if HA is configured) and NodeManager(one instance per node). See mr1.memory.percent, mr1.cpu.percent and
-mr1.disk.percent in warden.conf. Rest is given to YARN applications.
-Also see /opt/mapr/conf/conf.d/warden.resourcemanager.conf and
- /opt/mapr/conf/conf.d/warden.nodemanager.conf for resources given to ResourceManager and NodeManager respectively.
+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.
+
+Configure ResourceManager and NodeManager memory in `/opt/mapr/conf/conf.d/warden.resourcemanager.conf` and
+ `/opt/mapr/conf/conf.d/warden.nodemanager.conf`. Configure the following warden.nodemanager.conf settings. The defaults are:
+
+ service.heapsize.min=64
+ service.heapsize.max=325
+ service.heapsize.percent=2
+
+Memory allocation for NodeManager and ResourceManager is used only to calculate total memory required for all services to run. The -Xmx option is not set, allowing memory on to grow as needed. 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.
-## Configuring Drill in a MapReduce V1-enabled cluster
+### MapReduce v1 Resources
-Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). For example:
-## What are the memory/resource configurations set in warden in a non-YARN cluster?
+To configure memory for MapReduce v1 resources set mr1.memory.percent, mr1.cpu.percent and mr1.disk.percent in warden.conf, 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.
-Every service will have 3 values defined in warden.conf (/opt/mapr/conf)
-service.command.<servicename>.heapsize.percent
-service.command.<servicename>.heapsize.max
-service.command.<servicename>.heapsize.min
-This is percentage of memory for that service bounded by min and max values.
-There will also be additional files in /opt/mapr/conf/conf.d in format
-warden.<servicename>.conf. They will have entries like
-service.heapsize.min
-service.heapsize.max
-service.heapsize.percent -->
+### MapReduce v2 and other Resources
-## Managing Memory
+Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf).
-To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs.
+You configure memory for each service by setting three values in `warden.conf`.
-To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
+ service.command.<servicename>.heapsize.percent
+ service.command.<servicename>.heapsize.max
+ service.command.<servicename>.heapsize.min
### Drill Memory
You can configure the amount of direct memory allocated to a Drillbit for
http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-resources-in-a-cluster.md b/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
new file mode 100644
index 0000000..7995278
--- /dev/null
+++ b/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
@@ -0,0 +1,78 @@
+---
+title: "Configuring Resources in a 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 reserve memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node.
+
+ [root@centos23 conf.d]# pwd
+ /opt/mapr/conf/conf.d
+ [root@centos23 conf.d]# ls
+ warden.drill-bits.conf warden.nodemanager.conf warden.resourcemanager.conf
+
+You add the following lines to the file:
+
+ service.heapsize.min=<some value in MB>
+ service.heapsize.max=<some value in MB>
+ service.heapsize.percent=<some whole number value>
+
+## Configuring Drill in a YARN-enabled MapR Cluster
+
+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
+
+To add Drill to the cluster, how do you change memory allocation? It depends on your application. 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 2 main services ResourceManager(one instance in cluster, more if HA is configured) and NodeManager(one instance per node). See mr1.memory.percent, mr1.cpu.percent and
+mr1.disk.percent in warden.conf. Rest is given to YARN applications.
+Also see /opt/mapr/conf/conf.d/warden.resourcemanager.conf and
+ /opt/mapr/conf/conf.d/warden.nodemanager.conf for resources given to ResourceManager and NodeManager respectively.
+
+## Configuring Drill in a MapReduce V1-enabled cluster
+
+Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). For example:
+## What are the memory/resource configurations set in warden in a non-YARN cluster?
+
+Every service will have 3 values defined in warden.conf (/opt/mapr/conf)
+service.command.<servicename>.heapsize.percent
+service.command.<servicename>.heapsize.max
+service.command.<servicename>.heapsize.min
+This is percentage of memory for that service bounded by min and max values.
+
+There will also be additional files in /opt/mapr/conf/conf.d in format
+warden.<servicename>.conf. They will have entries like
+service.heapsize.min
+service.heapsize.max
+service.heapsize.percent -->
+
+## Managing Memory
+
+To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs.
+
+To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
+
+### Drill Memory
+You can configure the amount of direct memory allocated to a Drillbit for
+query processing, as described in the section, ["Configuring Memory"](({{site.baseurl}}/docs/configuring-memory).
+
+### Memory in a MapR Cluster
+Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:
+
+ service.command.os.heapsize.percent
+ service.command.os.heapsize.max
+ service.command.os.heapsize.min
+
+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/53a424ad/_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 0466d3b..7ffe0b7 100644
--- a/_docs/manage-drill/017-configuring-a-shared-drillbit.md
+++ b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
@@ -1,5 +1,5 @@
---
-title: "Configuring a Shared Drillbit"
+title: "Configuring Resources for a Shared Drillbit"
parent: "Configuring Different Workloads"
---
To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.
http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
new file mode 100644
index 0000000..7ffe0b7
--- /dev/null
+++ b/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
@@ -0,0 +1,65 @@
+---
+title: "Configuring Resources for a Shared Drillbit"
+parent: "Configuring Different Workloads"
+---
+To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.
+
+##Configuring Drill Query Queuing
+
+Set [options in sys.options]({{site.baseurl}}/docs/configuration-options-introduction/) to enable and manage query queuing, which is turned off by default. There are two types of queues: large and small. You configure a maximum number of queries that each queue allows by configuring the following options in the `sys.options` table:
+
+* exec.queue.large
+* exec.queue.small
+
+### Example Configuration
+
+For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queries to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:
+
+* Query A (blue): 1 billion records, Drill estimates 10 million rows will be processed
+* Query B (red): 2 billion records, Drill estimates 20 million rows will be processed
+* Query C: 1 billion records
+* Query D: 100 records
+
+The exec.queue.threshold default is 30 million, which is the estimated rows to be processed by the query. Queries A and B are queued in the large queue. The estimated rows to be processed reaches the 30 million threshold, filling the queue to capacity. The query C request arrives and goes on the wait list, and then query D arrives. Query D is queued immediately in the small queue because of its small size, as shown in the following diagram:
+
+
+
+The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns, freeing space in the large queue to process queries that are waiting.
+
+## Controlling Parallelization
+
+By default, Drill parallelizes operations when number of records manipulated within a fragment reaches 100,000. When parallelization of operations is high, the cluster operates as fast as possible, which is fine for a single user. In a contentious multi-tenant situation, however, you need to reduce parallelization to levels based on user needs.
+
+### Parallelization Configuration Procedure
+
+To configure parallelization, configure the following options in the `sys.options` table:
+
+* `planner.width.max.per.node`
+ The maximum degree of distribution of a query across cores and cluster nodes.
+* `planner.width.max.per.query`
+ Same as max per node but applies to the query as executed by the entire cluster.
+
+Configure the `planner.width.max.per.node` to achieve fine grained, absolute control over parallelization.
+
+<!-- ??For example, setting the `planner.width.max.per.query` to 60 will not accelerate Drill operations because overlapping does not occur when executing 60 queries at the same time.??
+
+### Example of Configuring Parallelization
+
+For example, the default settings parallelize 70 percent of operations up to 1,000 cores. If you have 30 cores per node in a 10-node cluster, or 300 cores, parallelization occurs on approximately 210 cores. Consequently, a single user can get 70 percent usage from a cluster and no more due to the constraints configured by the `planner.width.max.per.query`.
+
+A parallelizer in the Foreman transforms the physical plan into multiple phases. A complicated query can have multiple, major fragments. A default parallelization of 70 percent of operations allows some overlap of query phases. In the example, 210 ??for each core or major fragment to a maximum of 410??.
+
+??Drill uses pipelines, blocking/nonblocking, memory is not fungible. CPU resources are fungible. There is contention for CPUs.?? -->
+
+## Data Isolation
+
+Tenants can share data on a cluster using Drill views and impersonation. ??Link to impersonation doc.??
+
+
+
+
+
+
+
+
+