You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2013/12/04 21:12:15 UTC
[6/8] git commit: Remove socksipy dependency from http_signaler.
Remove socksipy dependency from http_signaler.
Remove socksipy dependency from http_signaler.
Fixes small issue in environment bootstrapping script.
Increments twitter.aurora artifact version numbers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/52b566cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/52b566cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/52b566cb
Branch: refs/heads/master
Commit: 52b566cb6e49289dfc978969b50faad70e245440
Parents: ce669c1
Author: Brian Wickman <wi...@twitter.com>
Authored: Mon Dec 2 10:41:19 2013 -0800
Committer: Brian Wickman <wi...@twitter.com>
Committed: Mon Dec 2 10:41:19 2013 -0800
----------------------------------------------------------------------
.gitignore | 1 +
examples/vagrant/provision-dev-environment.sh | 2 +-
src/main/python/twitter/aurora/BUILD.thirdparty | 1 -
src/main/python/twitter/aurora/client/BUILD | 2 +-
src/main/python/twitter/aurora/common/BUILD | 6 +-----
.../python/twitter/aurora/common/http_signaler.py | 18 ++++++++++--------
src/main/python/twitter/aurora/config/BUILD | 2 +-
src/main/python/twitter/aurora/executor/BUILD | 2 +-
8 files changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f680e29..3731eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.iws
*.pyc
*~
+.coverage
.gradle/
.pants.*
.reviewboardrc
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/examples/vagrant/provision-dev-environment.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-environment.sh b/examples/vagrant/provision-dev-environment.sh
index f2e53ab..957f93d 100755
--- a/examples/vagrant/provision-dev-environment.sh
+++ b/examples/vagrant/provision-dev-environment.sh
@@ -68,4 +68,4 @@ EOF
done
popd
-sudo chown -R vagrant.vagrant mesos mesos-build aurora .pex
+sudo chown -R vagrant.vagrant mesos mesos-build aurora
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/src/main/python/twitter/aurora/BUILD.thirdparty
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/BUILD.thirdparty b/src/main/python/twitter/aurora/BUILD.thirdparty
index bcfa2af..87156ea 100644
--- a/src/main/python/twitter/aurora/BUILD.thirdparty
+++ b/src/main/python/twitter/aurora/BUILD.thirdparty
@@ -15,5 +15,4 @@ make_dep('mox', '0.5.3')
make_dep('psutil', '1.1.2')
make_dep('pystachio', '0.7.2')
make_dep('pyyaml', '3.10', 'PyYAML')
-make_dep('socksipy-branch', '1.01', 'SocksiPy-Branch')
make_dep('thrift', '0.9.0')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/src/main/python/twitter/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/client/BUILD b/src/main/python/twitter/aurora/client/BUILD
index ded3cdc..a96a801 100644
--- a/src/main/python/twitter/aurora/client/BUILD
+++ b/src/main/python/twitter/aurora/client/BUILD
@@ -68,7 +68,7 @@ python_library(
],
provides = setup_py(
name = 'twitter.aurora.client',
- version = '0.1.1',
+ version = '0.1.2',
).with_binaries(
aurora_admin = pants('src/main/python/twitter/aurora/client/bin:aurora_admin'),
aurora_client = pants('src/main/python/twitter/aurora/client/bin:aurora_client'),
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/src/main/python/twitter/aurora/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/common/BUILD b/src/main/python/twitter/aurora/common/BUILD
index aeac6fd..c948f94 100644
--- a/src/main/python/twitter/aurora/common/BUILD
+++ b/src/main/python/twitter/aurora/common/BUILD
@@ -37,10 +37,6 @@ python_library(
name = 'http_signaler',
sources = ['http_signaler.py'],
dependencies = [
- # TODO(wickman) This dependency needs to be removed. It is a scope leak
- # for monkeypatched SOCKS usage and should be moved into an org-specific
- # HttpSignaler and injected at the AuroraClientAPI level.
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:socksipy-branch'),
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
]
@@ -58,7 +54,7 @@ python_library(
],
provides = setup_py(
name = 'twitter.aurora.common',
- version = '0.1.1',
+ version = '0.1.2',
description = 'Aurora common libraries.',
license = 'Apache License, Version 2.0',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/src/main/python/twitter/aurora/common/http_signaler.py
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/common/http_signaler.py b/src/main/python/twitter/aurora/common/http_signaler.py
index 47c86d5..778ddc4 100644
--- a/src/main/python/twitter/aurora/common/http_signaler.py
+++ b/src/main/python/twitter/aurora/common/http_signaler.py
@@ -14,10 +14,6 @@ else:
import urllib2 as urllib_request
from urllib2 import URLError, HTTPError
-# TODO(wickman) This is an abstraction leak -- this should be fixed upstream by
-# MESOS-3710
-import socks
-
class HttpSignaler(object):
"""Simple HTTP endpoint wrapper to check health or trigger quitquitquit/abortabortabort"""
@@ -43,16 +39,22 @@ class HttpSignaler(object):
"""Request an HTTP endpoint with a GET request (or POST if data is not None)"""
url = self.url(endpoint)
log.debug("%s: %s %s" % (self.__class__.__name__, 'GET' if data is None else 'POST', url))
+
+ def raise_error(reason):
+ raise self.QueryError('Failed to signal %s: %s' % (self.url(endpoint), reason))
+
try:
with contextlib.closing(
self.opener(url, data, timeout=self._timeout_secs)) as fp:
return fp.read()
- except (URLError, HTTPError, HTTPException, SocketTimeout, socks.GeneralProxyError) as e:
+ except (HTTPException, SocketTimeout) as e:
# the type of an HTTPException is typically more useful than its contents (since for example
# BadStatusLines are often empty). likewise with socket.timeout.
- err = e.__class__.__name__ if isinstance(e, (HTTPException, SocketTimeout)) else e
- reason = 'Failed to signal %s: %s' % (self.url(endpoint), err)
- raise self.QueryError(reason)
+ raise_error('Error within %s' % e.__class__.__name__)
+ except (URLError, HTTPError) as e:
+ raise_error(e)
+ except Exception as e:
+ raise_error('Unexpected error: %s' % e)
def __call__(self, endpoint, use_post_method=False, expected_response=None):
"""Returns a (boolean, string|None) tuple of (call success, failure reason)"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/src/main/python/twitter/aurora/config/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/config/BUILD b/src/main/python/twitter/aurora/config/BUILD
index 9cdf112..0462158 100644
--- a/src/main/python/twitter/aurora/config/BUILD
+++ b/src/main/python/twitter/aurora/config/BUILD
@@ -34,7 +34,7 @@ python_library(
],
provides = setup_py(
name = 'twitter.aurora.config',
- version = '0.1.1',
+ version = '0.1.2',
description = 'Aurora/Thermos Pystachio schemas for describing job configurations.',
license = 'Apache License, Version 2.0',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/52b566cb/src/main/python/twitter/aurora/executor/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/executor/BUILD b/src/main/python/twitter/aurora/executor/BUILD
index 47614da..02d34f0 100644
--- a/src/main/python/twitter/aurora/executor/BUILD
+++ b/src/main/python/twitter/aurora/executor/BUILD
@@ -128,7 +128,7 @@ python_library(
],
provides = setup_py(
name = 'twitter.aurora.executor',
- version = '0.1.2',
+ version = '0.1.3',
).with_binaries(
gc_executor = pants('src/main/python/twitter/aurora/executor/bin:gc_executor'),
thermos_executor = pants('src/main/python/twitter/aurora/executor/bin:thermos_executor'),