You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by su...@apache.org on 2016/08/07 17:00:10 UTC
[1/3] drill git commit: DRILL-4623: Disable epoll transport by default
Repository: drill
Updated Branches:
refs/heads/master 18e16610a -> 4bd67a660
DRILL-4623: Disable epoll transport by default
closes #486
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/48b3fd2e
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/48b3fd2e
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/48b3fd2e
Branch: refs/heads/master
Commit: 48b3fd2ee040f30be3ff3172bf03111ca58d4b48
Parents: 18e1661
Author: Sudheesh Katkam <sk...@maprtech.com>
Authored: Thu Apr 21 10:28:29 2016 -0700
Committer: Sudheesh Katkam <sk...@maprtech.com>
Committed: Fri Aug 5 17:30:42 2016 -0700
----------------------------------------------------------------------
distribution/src/resources/drill-config.sh | 2 +-
.../src/main/java/org/apache/drill/exec/rpc/TransportCheck.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/48b3fd2e/distribution/src/resources/drill-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index a72cb84..de37162 100644
--- a/distribution/src/resources/drill-config.sh
+++ b/distribution/src/resources/drill-config.sh
@@ -182,7 +182,7 @@ export DRILLBIT_MAX_PERM=${DRILLBIT_MAX_PERM:-"512M"}
export DRILLBIT_CODE_CACHE_SIZE=${DRILLBIT_CODE_CACHE_SIZE:-"1G"}
export DRILLBIT_OPTS="-Xms$DRILL_HEAP -Xmx$DRILL_HEAP -XX:MaxDirectMemorySize=$DRILL_MAX_DIRECT_MEMORY"
-export DRILLBIT_OPTS="$DRILLBIT_OPTS -XX:ReservedCodeCacheSize=$DRILLBIT_CODE_CACHE_SIZE -Ddrill.exec.enable-epoll=true"
+export DRILLBIT_OPTS="$DRILLBIT_OPTS -XX:ReservedCodeCacheSize=$DRILLBIT_CODE_CACHE_SIZE -Ddrill.exec.enable-epoll=false"
export DRILLBIT_OPTS="$DRILLBIT_OPTS -XX:MaxPermSize=$DRILLBIT_MAX_PERM"
# Under YARN, the log directory is usually YARN-provided. Replace any
http://git-wip-us.apache.org/repos/asf/drill/blob/48b3fd2e/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java
----------------------------------------------------------------------
diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java
index c789af8..4886c98 100644
--- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java
+++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java
@@ -45,6 +45,8 @@ public class TransportCheck {
String name = SystemPropertyUtil.get("os.name").toLowerCase(Locale.US).trim();
+ // Epoll is disabled by default (see distribution/src/resources/drill-env.sh) due to
+ // https://github.com/netty/netty/issues/3539
if (name.startsWith("linux") && SystemPropertyUtil.getBoolean(USE_LINUX_EPOLL, false)) {
SUPPORTS_EPOLL = true;
} else {
[2/3] drill git commit: DRILL-4819: Update MapR version to 5.2.0
Posted by su...@apache.org.
DRILL-4819: Update MapR version to 5.2.0
closes #556
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/8bbf6589
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/8bbf6589
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/8bbf6589
Branch: refs/heads/master
Commit: 8bbf6589ad746b8949c962875f0ea2de59a13f79
Parents: 48b3fd2
Author: Patrick Wong <Patrick Wong>
Authored: Mon Aug 1 18:03:06 2016 -0700
Committer: Sudheesh Katkam <sk...@maprtech.com>
Committed: Fri Aug 5 17:37:14 2016 -0700
----------------------------------------------------------------------
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/8bbf6589/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c953f88..63d686a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1397,10 +1397,10 @@
<properties>
<alt-hadoop>mapr</alt-hadoop>
<rat.excludeSubprojects>true</rat.excludeSubprojects>
- <hive.version>1.2.0-mapr-1601</hive.version>
+ <hive.version>1.2.0-mapr-1607</hive.version>
<hbase.version>1.1.1-mapr-1602-m7-5.1.0</hbase.version>
- <hadoop.version>2.7.0-mapr-1602</hadoop.version>
- <mapr.core.version>5.1.0-mapr</mapr.core.version>
+ <hadoop.version>2.7.0-mapr-1607</hadoop.version>
+ <mapr.core.version>5.2.0-mapr</mapr.core.version>
</properties>
<dependencyManagement>
<dependencies>
[3/3] drill git commit: DRILL-4822: Add site directory to
distrib-env.sh search path
Posted by su...@apache.org.
DRILL-4822: Add site directory to distrib-env.sh search path
closes #558
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/4bd67a66
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/4bd67a66
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/4bd67a66
Branch: refs/heads/master
Commit: 4bd67a66073a429fb19c4f21f4113fef8a24db21
Parents: 8bbf658
Author: Paul Rogers <pr...@maprtech.com>
Authored: Tue Aug 2 15:16:03 2016 -0700
Committer: Sudheesh Katkam <sk...@maprtech.com>
Committed: Fri Aug 5 17:37:14 2016 -0700
----------------------------------------------------------------------
distribution/src/resources/drill-config.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/4bd67a66/distribution/src/resources/drill-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index de37162..bdf3889 100644
--- a/distribution/src/resources/drill-config.sh
+++ b/distribution/src/resources/drill-config.sh
@@ -166,10 +166,17 @@ fi
# Source distrib-env.sh for any distribution-specific settings.
# distrib-env.sh is optional; it is created by some distribution installers
# that need distribution-specific settings.
+# Because installers write site-specific values into the file, the file
+# should be moved into the site directory, if the user employs one.
-distribEnv="$DRILL_HOME/conf/distrib-env.sh"
+distribEnv="$DRILL_CONF_DIR/distrib-env.sh"
if [ -r "$distribEnv" ]; then
. "$distribEnv"
+else
+ distribEnv="$DRILL_HOME/conf/distrib-env.sh"
+ if [ -r "$distribEnv" ]; then
+ . "$distribEnv"
+ fi
fi
# Default memory settings if none provided by the environment or