You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/08/13 21:49:58 UTC
[14/23] git commit: Improved the configure output when deprecated
headers are present on OS X.
Improved the configure output when deprecated headers are present
on OS X.
Review: https://reviews.apache.org/r/12045
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ad266206
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ad266206
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ad266206
Branch: refs/heads/vinod/0.13.0
Commit: ad2662067e3bfc8fd7d1d7eaaf4b30c2af3ed697
Parents: 8b6292d
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Fri Jun 21 17:00:44 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Mon Jul 1 12:47:20 2013 -0700
----------------------------------------------------------------------
configure.ac | 15 +++++++++++++--
src/master/master.cpp | 3 ++-
2 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ad266206/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index e76f775..6b9a29d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,7 +318,17 @@ __EOF__
["-I/System/Library/Frameworks/JavaVM.framework/Headers"]],
[JAVA_CPPFLAGS=java_cppflags
TRY_LINK_JNI([break])])
- AC_MSG_ERROR([failed to build with JNI]) # Exhausted options.
+ # Exhausted options.
+ AC_MSG_ERROR([failed to build with JNI
+ -------------------------------------------------------------------
+ It appears we were unable to compile against the JNI. This is most
+ likely due to one of the following issues:
+ 1. You do not have a JDK installed on your system.
+ 2. All JDKs installed on your system have deprecated JNI headers.
+ It is advised to install OpenJDK on your system, as the JDK that
+ ships with OS X has deprecated JNI headers.
+ -------------------------------------------------------------------
+ ])
done
else
while true; do # Loop until sucessful (via break) or exhausted options.
@@ -326,7 +336,8 @@ __EOF__
[["-I$JAVA_HOME/include -I$JAVA_HOME/include/$OS_NAME"]],
[JAVA_CPPFLAGS=java_cppflags
TRY_LINK_JNI([break])])
- AC_MSG_ERROR([failed to build with JNI]) # Exhausted options.
+ # Exhausted options.
+ AC_MSG_ERROR([failed to build with JNI])
done
fi
else
http://git-wip-us.apache.org/repos/asf/mesos/blob/ad266206/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index df5794b..d424a69 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -1981,7 +1981,8 @@ void Master::removeSlave(Slave* slave)
task->task_id(),
TASK_LOST,
"Slave " + slave->info.hostname() + " removed",
- (task->has_executor_id() ? task->executor_id() : None())));
+ (task->has_executor_id() ?
+ Option<ExecutorID>(task->executor_id()) : None())));
LOG(INFO) << "Sending status update " << message.update()
<< " due to the removal of slave "