components/openstack/swift/patches/remove_PyECLib.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 May 2017 17:33:26 -0700
changeset 7964 d9801318ed3d
parent 6853 cf1567491b1b
permissions -rw-r--r--
25981468 Build ilmbase and openexr with the GNU compilers
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
     1
In-house removal of PyECLib in Swift since we do not support the
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
     2
Erasure Code storage policy.
5448
56f4540f741d 22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents: 5405
diff changeset
     3
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
     4
This patch is Solaris-specific and not suitable for upstream.
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
     5
6853
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
     6
--- swift-2.7.0/swift/common/storage_policy.py.~1~	2016-03-25 02:42:55.000000000 -0700
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
     7
+++ swift-2.7.0/swift/common/storage_policy.py	2016-08-08 19:02:28.033539550 -0700
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
     8
@@ -22,7 +22,12 @@ from swift.common.utils import (
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
     9
 from swift.common.ring import Ring, RingData
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    10
 from swift.common.utils import quorum_size
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    11
 from swift.common.exceptions import RingValidationError
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    12
-from pyeclib.ec_iface import ECDriver, ECDriverError, VALID_EC_TYPES
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    13
+
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    14
+# Attempt to load PyEClib if installed
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    15
+try:
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    16
+    from pyeclib.ec_iface import ECDriver, ECDriverError, VALID_EC_TYPES
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    17
+except ImportError:
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    18
+    pass
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    19
 
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    20
 LEGACY_POLICY_NAME = 'Policy-0'
6853
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    21
 VALID_CHARS = '-' + string.ascii_letters + string.digits
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    22
--- swift-2.7.0/swift/proxy/controllers/obj.py.~1~	2016-03-25 02:42:55.000000000 -0700
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    23
+++ swift-2.7.0/swift/proxy/controllers/obj.py	2016-08-08 19:02:28.035065785 -0700
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    24
@@ -65,7 +65,7 @@ from swift.common.http import (
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    25
     HTTP_INSUFFICIENT_STORAGE, HTTP_PRECONDITION_FAILED, HTTP_CONFLICT,
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    26
     HTTP_UNPROCESSABLE_ENTITY, HTTP_REQUESTED_RANGE_NOT_SATISFIABLE)
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    27
 from swift.common.storage_policy import (POLICIES, REPL_POLICY, EC_POLICY,
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    28
-                                         ECDriverError, PolicyError)
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    29
+                                         PolicyError)
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    30
 from swift.proxy.controllers.base import Controller, delay_denial, \
6853
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    31
     cors_validation, ResumingGetter
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    32
 from swift.common.swob import HTTPAccepted, HTTPBadRequest, HTTPNotFound, \
6853
cf1567491b1b 24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5448
diff changeset
    33
@@ -76,6 +76,12 @@ from swift.common.swob import HTTPAccept
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    34
 from swift.common.request_helpers import is_sys_or_user_meta, is_sys_meta, \
5448
56f4540f741d 22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents: 5405
diff changeset
    35
     remove_items, copy_header_subset
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    36
 
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    37
+# Load PyEClib if installed
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    38
+try:
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    39
+    from swift.common.storage_policy import ECDriverError
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    40
+except ImportError:
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    41
+    pass
5448
56f4540f741d 22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents: 5405
diff changeset
    42
+
5405
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    43
 
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    44
 def copy_headers_into(from_r, to_r):
66fd59fecd68 PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
diff changeset
    45
     """