You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/07/11 18:27:49 UTC

[2/4] mesos git commit: Removed the network isolator specific check in netlink socket method.

Removed the network isolator specific check in netlink socket method.

This check has been performed in the port mapping isolator as well in
the corresponding tests.

Review: https://reviews.apache.org/r/49839


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

Branch: refs/heads/master
Commit: ac417f5b62bf91b75a1417c53c52d09dac8f618f
Parents: c1bd3a5
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Jul 8 16:19:02 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Jul 11 11:27:37 2016 -0700

----------------------------------------------------------------------
 src/linux/routing/internal.hpp | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/ac417f5b/src/linux/routing/internal.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/internal.hpp b/src/linux/routing/internal.hpp
index 132f62e..1b75727 100644
--- a/src/linux/routing/internal.hpp
+++ b/src/linux/routing/internal.hpp
@@ -28,8 +28,6 @@
 #include <stout/error.hpp>
 #include <stout/try.hpp>
 
-#include "linux/routing/utils.hpp"
-
 namespace routing {
 
 // Customized deallocation functions for netlink objects.
@@ -92,11 +90,6 @@ private:
 // TODO(chzhcn): Consider renaming 'routing' to 'netlink'.
 inline Try<Netlink<struct nl_sock>> socket(int protocol = NETLINK_ROUTE)
 {
-  Try<Nothing> checking = check();
-  if (checking.isError()) {
-    return Error(checking.error());
-  }
-
   struct nl_sock* s = nl_socket_alloc();
   if (s == nullptr) {
     return Error("Failed to allocate netlink socket");