You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/12/19 22:17:04 UTC
[1/4] mesos git commit: Shortened socket paths used in IO Switchboard
tests.
Repository: mesos
Updated Branches:
refs/heads/master daf291b6c -> 1e72605e9
Shortened socket paths used in IO Switchboard tests.
The maximum path length for a Unix domain socket is 104 characters on.
This commit drops a redundant UUID from the socket path to make sure
that the path fits into platform restrictions. This is safe because
tests only create a single Unix domain socket per temporary directory.
Review: https://reviews.apache.org/r/54859/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e2a75f20
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e2a75f20
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e2a75f20
Branch: refs/heads/master
Commit: e2a75f20224059eb2e6aac70cea3907009253ca0
Parents: daf291b
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Mon Dec 19 11:59:34 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Dec 19 11:59:34 2016 -0800
----------------------------------------------------------------------
.../containerizer/io_switchboard_tests.cpp | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e2a75f20/src/tests/containerizer/io_switchboard_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/io_switchboard_tests.cpp b/src/tests/containerizer/io_switchboard_tests.cpp
index 930f98f..e32df64 100644
--- a/src/tests/containerizer/io_switchboard_tests.cpp
+++ b/src/tests/containerizer/io_switchboard_tests.cpp
@@ -190,9 +190,7 @@ TEST_F(IOSwitchboardServerTest, RedirectLog)
ASSERT_SOME(stderrFd);
- string socketPath = path::join(
- sandbox.get(),
- "mesos-io-switchboard");
+ string socketPath = path::join(sandbox.get(), "mesos-io-switchboard");
Try<Owned<IOSwitchboardServer>> server = IOSwitchboardServer::create(
false,
@@ -298,9 +296,7 @@ TEST_F(IOSwitchboardServerTest, AttachOutput)
stderrFd = os::open(stderrPath, O_RDONLY);
ASSERT_SOME(stderrFd);
- string socketPath = path::join(
- sandbox.get(),
- "mesos-io-switchboard");
+ string socketPath = path::join(sandbox.get(), "mesos-io-switchboard");
Try<Owned<IOSwitchboardServer>> server = IOSwitchboardServer::create(
false,
@@ -374,9 +370,7 @@ TEST_F(IOSwitchboardServerTest, SendHeartbeat)
Duration heartbeat = Milliseconds(10);
- string socketPath = path::join(
- sandbox.get(),
- "mesos-io-switchboard-" + UUID::random().toString());
+ string socketPath = path::join(sandbox.get(), "mesos-io-switchboard");
Try<Owned<IOSwitchboardServer>> server = IOSwitchboardServer::create(
false,
@@ -489,9 +483,7 @@ TEST_F(IOSwitchboardServerTest, AttachInput)
ASSERT_SOME(stdinFd);
- string socketPath = path::join(
- sandbox.get(),
- "mesos-io-switchboard");
+ string socketPath = path::join(sandbox.get(), "mesos-io-switchboard");
Try<Owned<IOSwitchboardServer>> server = IOSwitchboardServer::create(
false,
@@ -613,9 +605,7 @@ TEST_F(IOSwitchboardServerTest, ReceiveHeartbeat)
Try<int> nullFd = os::open("/dev/null", O_RDWR);
ASSERT_SOME(nullFd);
- string socketPath = path::join(
- sandbox.get(),
- "mesos-io-switchboard-" + UUID::random().toString());
+ string socketPath = path::join(sandbox.get(), "mesos-io-switchboard");
Try<Owned<IOSwitchboardServer>> server = IOSwitchboardServer::create(
false,
[2/4] mesos git commit: WebUI: Fixed the metrics display bug in agent
view.
Posted by jo...@apache.org.
WebUI: Fixed the metrics display bug in agent view.
This commit changes the variable that agent metrics are saved to,
preventing two asynchronous calls from overwriting each other's data.
Review: https://reviews.apache.org/r/54833/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8f535853
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8f535853
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8f535853
Branch: refs/heads/master
Commit: 8f5358530d5106ed0a9c9b7d788303092e78d775
Parents: e2a75f2
Author: haosdent huang <ha...@gmail.com>
Authored: Mon Dec 19 13:44:21 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Dec 19 13:44:21 2016 -0800
----------------------------------------------------------------------
src/webui/master/static/agent.html | 16 ++++++++--------
src/webui/master/static/js/controllers.js | 20 ++++++++------------
2 files changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f535853/src/webui/master/static/agent.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/agent.html b/src/webui/master/static/agent.html
index 3d15d55..7a45993 100644
--- a/src/webui/master/static/agent.html
+++ b/src/webui/master/static/agent.html
@@ -49,35 +49,35 @@
<tbody>
<tr>
<td>Staging</td>
- <td class="text-right">{{state.staging_tasks | number}}</td>
+ <td class="text-right">{{staging_tasks | number}}</td>
</tr>
<tr>
<td>Starting</td>
- <td class="text-right">{{state.starting_tasks | number}}</td>
+ <td class="text-right">{{starting_tasks | number}}</td>
</tr>
<tr>
<td>Running</td>
- <td class="text-right">{{state.running_tasks | number}}</td>
+ <td class="text-right">{{running_tasks | number}}</td>
</tr>
<tr>
<td>Killing</td>
- <td class="text-right">{{state.killing_tasks | number}}</td>
+ <td class="text-right">{{killing_tasks | number}}</td>
</tr>
<tr>
<td>Finished</td>
- <td class="text-right">{{state.finished_tasks | number}}</td>
+ <td class="text-right">{{finished_tasks | number}}</td>
</tr>
<tr>
<td>Killed</td>
- <td class="text-right">{{state.killed_tasks | number}}</td>
+ <td class="text-right">{{killed_tasks | number}}</td>
</tr>
<tr>
<td>Failed</td>
- <td class="text-right">{{state.failed_tasks | number}}</td>
+ <td class="text-right">{{failed_tasks | number}}</td>
</tr>
<tr>
<td>Lost</td>
- <td class="text-right">{{state.lost_tasks | number}}</td>
+ <td class="text-right">{{lost_tasks | number}}</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f535853/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 5dcfbdb..388ca24 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -563,18 +563,14 @@
$http.jsonp('//' + host + '/metrics/snapshot?jsonp=JSON_CALLBACK')
.success(function (response) {
- if (!$scope.state) {
- $scope.state = {};
- }
-
- $scope.state.staging_tasks = response['slave/tasks_staging'];
- $scope.state.starting_tasks = response['slave/tasks_starting'];
- $scope.state.running_tasks = response['slave/tasks_running'];
- $scope.state.killing_tasks = response['slave/tasks_killing'];
- $scope.state.finished_tasks = response['slave/tasks_finished'];
- $scope.state.killed_tasks = response['slave/tasks_killed'];
- $scope.state.failed_tasks = response['slave/tasks_failed'];
- $scope.state.lost_tasks = response['slave/tasks_lost'];
+ $scope.staging_tasks = response['slave/tasks_staging'];
+ $scope.starting_tasks = response['slave/tasks_starting'];
+ $scope.running_tasks = response['slave/tasks_running'];
+ $scope.killing_tasks = response['slave/tasks_killing'];
+ $scope.finished_tasks = response['slave/tasks_finished'];
+ $scope.killed_tasks = response['slave/tasks_killed'];
+ $scope.failed_tasks = response['slave/tasks_failed'];
+ $scope.lost_tasks = response['slave/tasks_lost'];
})
.error(function(reason) {
$scope.alert_message = 'Failed to get agent metrics: ' + reason;
[4/4] mesos git commit: Removed some extra spaces.
Posted by jo...@apache.org.
Removed some extra spaces.
Review: https://reviews.apache.org/r/54832/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1e72605e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1e72605e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1e72605e
Branch: refs/heads/master
Commit: 1e72605e9892eb4e518442ab9c1fe2a1a1696748
Parents: 27b7861
Author: haosdent huang <ha...@gmail.com>
Authored: Mon Dec 19 13:51:04 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Dec 19 13:51:04 2016 -0800
----------------------------------------------------------------------
src/examples/load_generator_framework.cpp | 2 +-
src/linux/routing/queueing/htb.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1e72605e/src/examples/load_generator_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/load_generator_framework.cpp b/src/examples/load_generator_framework.cpp
index 99fa760..7f1ada5 100644
--- a/src/examples/load_generator_framework.cpp
+++ b/src/examples/load_generator_framework.cpp
@@ -297,7 +297,7 @@ int main(int argc, char** argv)
}
if (flags.master.isNone()) {
- cerr << flags.usage( "Missing required option --master") << endl;
+ cerr << flags.usage("Missing required option --master") << endl;
return EXIT_FAILURE;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/1e72605e/src/linux/routing/queueing/htb.cpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/queueing/htb.cpp b/src/linux/routing/queueing/htb.cpp
index faadf32..4641202 100644
--- a/src/linux/routing/queueing/htb.cpp
+++ b/src/linux/routing/queueing/htb.cpp
@@ -84,7 +84,7 @@ Result<htb::Config> decode<htb::Config>(
namespace htb {
-Try<bool> exists( const string& link, const Handle& parent)
+Try<bool> exists(const string& link, const Handle& parent)
{
return internal::exists(link, parent, KIND);
}
[3/4] mesos git commit: Removed extra space in
`stout/flags/flags.hpp`.
Posted by jo...@apache.org.
Removed extra space in `stout/flags/flags.hpp`.
Review: https://reviews.apache.org/r/54831/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/27b78611
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/27b78611
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/27b78611
Branch: refs/heads/master
Commit: 27b78611c84c5728e8712d88909e96d17624a0ab
Parents: 8f53585
Author: haosdent huang <ha...@gmail.com>
Authored: Mon Dec 19 13:50:09 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Dec 19 13:50:09 2016 -0800
----------------------------------------------------------------------
3rdparty/stout/include/stout/flags/flags.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/27b78611/3rdparty/stout/include/stout/flags/flags.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/flags/flags.hpp b/3rdparty/stout/include/stout/flags/flags.hpp
index ecadaf8..61d17a9 100644
--- a/3rdparty/stout/include/stout/flags/flags.hpp
+++ b/3rdparty/stout/include/stout/flags/flags.hpp
@@ -836,7 +836,7 @@ inline Try<Warnings> FlagsBase::load(
}
-inline std::string FlagsBase::usage( const Option<std::string>& message) const
+inline std::string FlagsBase::usage(const Option<std::string>& message) const
{
const int PAD = 5;