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:22 UTC

[26/50] [abbrv] drill git commit: NR's review

NR's review


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/26b0b393
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/26b0b393
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/26b0b393

Branch: refs/heads/gh-pages
Commit: 26b0b393223fd77a36396505bca2254334ea7e75
Parents: 0ac6ebc
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 08:30:09 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 08:30:09 2015 -0700

----------------------------------------------------------------------
 ...and-multi-instance-architecture-introduction.md |  7 +++----
 .../015-how-to-run-drill-in-a-cluster.md           | 17 +++++++----------
 2 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/26b0b393/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md b/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
index 921d8d2..33c0b98 100644
--- a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
+++ b/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
@@ -12,12 +12,11 @@ Drill typically runs along side many application frameworks, including the follo
 * HBase  
 * Hive and Pig  
 * Spark  
-* Sqoop  
 
-You need to plan and configure the resources for use with Drill in a multitenant or multi-instance environment. Currently, you can configure the following resources:
+You need to plan and configure these resources for use with Drill in a multitenant or multi-instance environment: 
 
-* Memory  
-* CPU  
+* [Memory]()  
+* [CPU]({{site.baseurl}}/docs/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 a multitenant environment and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for a multi-instance environment.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/26b0b393/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md b/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
index 3bf5a2d..f407bdb 100644
--- a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
@@ -17,11 +17,11 @@ For information about Drill and Yarn, see [DRILL-142](https://issues.apache.org/
 
 ## Managing Memory
 
-To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, allocate memory in the same manner according to your application needs. 
+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]().
 
-## Allocating Memory for Drill
+### Drill Memory
 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
 depending on the workload. The total amount of direct memory that a Drillbit
@@ -43,20 +43,17 @@ env.sh`.
 
 If this parameter is not set, the limit depends on the amount of available system memory.
 
-### Managing Memory in a Yarn-enabled Cluster
-TBD
-
-### Managing Memory in MapReduce, HBase, Spark, and other clusters
-TBD
-
-### Managing Memory in a MapR Cluster
+### 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 [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes) in the MapR documentation.
+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