openstack/sahara
Code Issues Proposed changes

Fix storing binaries in Swift

Browse Source 
* Swift does not work with Keystone API v3, so we need to always provide
   auth_url for API v2 to Swift.
 * We incorrectly parsed swift URL, which resulted in Sahara trying
   to get binaries from containers with '.sahara' suffix, while the
   suffix should be stripped.

Closes-Bug: #1305210
Change-Id: I76dee756165e089bc408e584f3aa476c45ed6067
(cherry picked from commit 9ad556f598)
This commit is contained in:
Dmitry Mescheryakov 2014-04-11 02:59:08 +04:00 committed by Sergey Lukjanov
parent 682a8791ae
commit ae7df7ce6d
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sahara/service/edp/binary_retrievers/internal_swift.py
View File

@ -18,20 +18,25 @@ import swiftclient
import sahara.exceptions as ex
from sahara.swift import utils as su
from sahara.utils.openstack import base
CONF = cfg.CONF
def _get_conn(user, password):
return swiftclient.Connection(base.retrieve_auth_url(),
return swiftclient.Connection(su.retrieve_auth_url(),
user,
password,
tenant_name=CONF.os_admin_tenant_name,
auth_version="2.0")
def _strip_sahara_suffix(container_name):
if container_name.endswith(su.SWIFT_URL_SUFFIX):
container_name = container_name[:-len(su.SWIFT_URL_SUFFIX)]
return container_name
def get_raw_data(context, job_binary):
user = job_binary.extra["user"]
@ -53,6 +58,9 @@ def get_raw_data(context, job_binary):
# We are getting a whole container, return as a dictionary.
container = names[0]
# if container name has '.sahara' suffix we need to strip it
container = _strip_sahara_suffix(container)
# First check the size...
try:
headers = conn.head_container(container)
@ -64,15 +72,19 @@ def get_raw_data(context, job_binary):
"is greater than maximum (%sKB)")
body = {}
headers, objects = conn.get_container(names[0])
headers, objects = conn.get_container(container)
for item in objects:
headers, obj = conn.get_object(names[0], item["name"])
headers, obj = conn.get_object(container, item["name"])
body[item["name"]] = obj
except swiftclient.ClientException as e:
raise ex.SwiftClientException(e.message)
else:
container, obj = names
# if container name has '.sahara' suffix we need to strip it
container = _strip_sahara_suffix(container)
try:
# First check the size
headers = conn.head_object(container, obj)

1
sahara/swift/utils.py
View File

@ -26,6 +26,7 @@ CONF = cfg.CONF
SWIFT_INTERNAL_PREFIX = "swift://"
# TODO(mattf): remove support for OLD_SWIFT_INTERNAL_PREFIX
OLD_SWIFT_INTERNAL_PREFIX = "swift-internal://"
SWIFT_URL_SUFFIX = '.sahara'
def _get_service_address(service_type):