From f5808e9599e665fb2a391a771673d36b78c7ffb4 Mon Sep 17 00:00:00 2001 From: Jakub Kukul Date: Mon, 30 Apr 2018 15:20:10 +0200 Subject: [PATCH 1/3] Update defaultHadoopCoordinates in documentation. To match changes applied in #5382. --- docs/content/configuration/indexing-service.md | 2 +- docs/content/operations/other-hadoop.md | 2 +- services/src/main/java/io/druid/cli/PullDependencies.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/content/configuration/indexing-service.md b/docs/content/configuration/indexing-service.md index be4cb5e12b6e..d61d57fce707 100644 --- a/docs/content/configuration/indexing-service.md +++ b/docs/content/configuration/indexing-service.md @@ -340,7 +340,7 @@ Additional peon configs include: |`druid.peon.mode`|Choices are "local" and "remote". Setting this to local means you intend to run the peon as a standalone node (Not recommended).|remote| |`druid.indexer.task.baseDir`|Base temporary working directory.|`System.getProperty("java.io.tmpdir")`| |`druid.indexer.task.baseTaskDir`|Base temporary working directory for tasks.|`${druid.indexer.task.baseDir}/persistent/tasks`| -|`druid.indexer.task.defaultHadoopCoordinates`|Hadoop version to use with HadoopIndexTasks that do not request a particular version.|org.apache.hadoop:hadoop-client:2.3.0| +|`druid.indexer.task.defaultHadoopCoordinates`|Hadoop version to use with HadoopIndexTasks that do not request a particular version.|org.apache.hadoop:hadoop-client:2.8.3| |`druid.indexer.task.defaultRowFlushBoundary`|Highest row count before persisting to disk. Used for indexing generating tasks.|75000| |`druid.indexer.task.directoryLockTimeout`|Wait this long for zombie peons to exit before giving up on their replacements.|PT10M| |`druid.indexer.task.gracefulShutdownTimeout`|Wait this long on middleManager restart for restorable tasks to gracefully exit.|PT5M| diff --git a/docs/content/operations/other-hadoop.md b/docs/content/operations/other-hadoop.md index 98b685e931b6..52c5eb4931a1 100644 --- a/docs/content/operations/other-hadoop.md +++ b/docs/content/operations/other-hadoop.md @@ -69,7 +69,7 @@ classloader. 2. Batch ingestion uses jars from `hadoop-dependencies/` to submit Map/Reduce jobs (location customizable via the `druid.extensions.hadoopDependenciesDir` runtime property; see [Configuration](../configuration/index.html)). -`hadoop-client:2.3.0` is the default version of the Hadoop client bundled with Druid for both purposes. This works with +`hadoop-client:2.8.3` is the default version of the Hadoop client bundled with Druid for both purposes. This works with many Hadoop distributions (the version does not necessarily need to match), but if you run into issues, you can instead have Druid load libraries that exactly match your distribution. To do this, either copy the jars from your Hadoop cluster, or use the `pull-deps` tool to download the jars from a Maven repository. diff --git a/services/src/main/java/io/druid/cli/PullDependencies.java b/services/src/main/java/io/druid/cli/PullDependencies.java index b94a04012e58..8ca274b06198 100644 --- a/services/src/main/java/io/druid/cli/PullDependencies.java +++ b/services/src/main/java/io/druid/cli/PullDependencies.java @@ -167,7 +167,7 @@ public class PullDependencies implements Runnable @Option( name = "--no-default-hadoop", - description = "Don't pull down the default hadoop coordinate, i.e., org.apache.hadoop:hadoop-client:2.3.0. If `-h` option is supplied, then default hadoop coordinate will not be downloaded.", + description = "Don't pull down the default hadoop coordinate, i.e., org.apache.hadoop:hadoop-client:2.8.3. If `-h` option is supplied, then default hadoop coordinate will not be downloaded.", required = false) public boolean noDefaultHadoop = false; From a891a44f33d4e3d6d52e430c22ff3b213e3c7314 Mon Sep 17 00:00:00 2001 From: Jakub Kukul Date: Mon, 30 Apr 2018 15:28:01 +0200 Subject: [PATCH 2/3] Remove a parameter with defaults from example configuration file. If it has reasonable defaults, then why would it be in an example config file? Also, it is yet another place that has been forgotten to be updated and will be forgotten in the future. Also, if someone is running different hadoop version, then there's much more work to be done than just changing this property, so why give users false hopes? --- examples/conf-quickstart/druid/middleManager/runtime.properties | 1 - examples/conf/druid/middleManager/runtime.properties | 1 - 2 files changed, 2 deletions(-) diff --git a/examples/conf-quickstart/druid/middleManager/runtime.properties b/examples/conf-quickstart/druid/middleManager/runtime.properties index 254148fc51dd..fcfb974603fd 100644 --- a/examples/conf-quickstart/druid/middleManager/runtime.properties +++ b/examples/conf-quickstart/druid/middleManager/runtime.properties @@ -17,4 +17,3 @@ druid.indexer.fork.property.druid.processing.numThreads=2 # Hadoop indexing druid.indexer.task.hadoopWorkingPath=var/druid/hadoop-tmp -druid.indexer.task.defaultHadoopCoordinates=["org.apache.hadoop:hadoop-client:2.7.3"] diff --git a/examples/conf/druid/middleManager/runtime.properties b/examples/conf/druid/middleManager/runtime.properties index 50f03013c5a7..b099dd5f6151 100644 --- a/examples/conf/druid/middleManager/runtime.properties +++ b/examples/conf/druid/middleManager/runtime.properties @@ -17,4 +17,3 @@ druid.indexer.fork.property.druid.processing.numThreads=2 # Hadoop indexing druid.indexer.task.hadoopWorkingPath=var/druid/hadoop-tmp -druid.indexer.task.defaultHadoopCoordinates=["org.apache.hadoop:hadoop-client:2.7.3"] From 952a02ec1914f8395ae6c4faa55cb8b2cd264742 Mon Sep 17 00:00:00 2001 From: Jakub Kukul Date: Mon, 30 Apr 2018 15:29:06 +0200 Subject: [PATCH 3/3] Fix typo in documentation. --- docs/content/querying/lookups.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/querying/lookups.md b/docs/content/querying/lookups.md index b6b83977a637..e7ecf2d238f9 100644 --- a/docs/content/querying/lookups.md +++ b/docs/content/querying/lookups.md @@ -332,7 +332,7 @@ The return value will be the json representation of the factory. ``` # Configuration -See the [coordinator configuration guilde](../configuration/coordinator.html) for coordinator configuration +See the [coordinator configuration guide](../configuration/coordinator.html) for coordinator configuration. To configure a Broker / Router / Historical / Peon to announce itself as part of a lookup tier, use the `druid.zk.paths.lookupTier` property.