9890184ea9378fbba1cb76e861f5a20bdd36b7c9
Commit Graph

5806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Burke
9890184ea9 Turn on H233 and start using print function
As much as anything, I'm just tired of seeing a bunch or piecemeal
fixes.
Note that we *need* to include
 from __future__ import print_function
in order to support things like
 print() # Would print "()" (the repr of an empty tuple) otherwise
 print(foo, end='') # Would SyntaxError
 print(bar, file=sys.stderr) # Would SyntaxError
Change-Id: I8fdf0740e292eb1ee785512d02e8c552781dcae1
2016年07月08日 16:19:52 +00:00
Jenkins
ae2b7a0ce8 Merge "Python 3: fix urllib import" 2016年07月08日 14:25:35 +00:00
Jenkins
a67a029f98 Merge "Run flake8 against scripts in bin" 2016年07月08日 09:22:41 +00:00
Jenkins
edc562e68b Merge "Fix unicode errors in object controller logging" 2016年07月08日 07:31:47 +00:00
Victor Stinner
dcee702801 Python 3: fix urllib import
Replace urllib.quote import with six.moves.urllib.parse.quote, so the
code works on Python 2 and Python 3.
Change-Id: I17e9cd9668661b6a67f33db83e0cbfc8ea6e3ca6
2016年07月08日 07:01:04 +00:00
Tim Burke
da317f01c6 Run flake8 against scripts in bin
Just having a `flake8 --filename=swift* bin` command is insufficient.
Change-Id: Ia2a5c364e52d9972d31e6b5e22366503894b720d
2016年07月08日 06:42:48 +00:00
Jenkins
4ecc62a88c Merge "Add basic functests for user object metadata" 2016年07月08日 03:13:35 +00:00
Jenkins
a50ed78641 Merge "Fixed inconsistent naming conventions" 2016年07月07日 23:34:33 +00:00
Jenkins
63c7d65273 Merge "Tighten memcached tests" 2016年07月07日 23:07:38 +00:00
Jenkins
f37ad6dc5a Merge "Correct reraising of exception" 2016年07月07日 23:07:30 +00:00
Jenkins
8938d07843 Merge "Python 3: dict.iteritems() and dict.itervalues()" 2016年07月07日 23:03:02 +00:00
Jenkins
120cabc298 Merge "Python 3: Fix basestring, long and StringIO" 2016年07月07日 23:01:13 +00:00
Nandini Tata
6f230c7ea0 Fixed inconsistent naming conventions
Fixed naming conventions of Keystone, Swift and proxy servers in
the docs.
Change-Id: I294afd8d7bffa8c1fc299f5812effacb9ad08910
2016年07月07日 21:40:21 +00:00
Jenkins
c350a481b8 Merge "MockMemcached cleanup" 2016年07月07日 21:14:23 +00:00
Jenkins
e7ec26dbd9 Merge "Add __ne__ built-in function" 2016年07月07日 21:13:18 +00:00
Jenkins
a0827114ef Merge "Add install-guide for swift" 2016年07月07日 19:48:55 +00:00
Tim Burke
b6be925cf5 Tighten memcached tests
Check flags set and key used; stop relying on dict.values()
Change-Id: Ibf9228dabd66ae98fb3b64050ccd46f5032d0df9
2016年07月07日 15:34:44 -04:00
Jenkins
7ccb3787d7 Merge "Add encryption package requirements to SAIO instructions" 2016年07月07日 19:27:08 +00:00
Jenkins
5566c69b4d Merge "added note to testFileSizeLimit functional test" 2016年07月07日 19:26:57 +00:00
Jenkins
86955992d2 Merge "Another amendment with missing parenthesis" 2016年07月07日 19:21:46 +00:00
Jenkins
813b293e0f Merge "Remove an unused variable from tests.py" 2016年07月07日 19:06:21 +00:00
Jenkins
fcba866138 Merge "make print python3 compatible" 2016年07月07日 18:30:18 +00:00
Jenkins
125a808fee Merge "Fix typo in object-server.conf and container-server.conf manpage" 2016年07月07日 18:30:10 +00:00
Jenkins
787ed00c10 Merge "Fix typo in the account-server.conf manpage" 2016年07月07日 18:28:11 +00:00
Alistair Coles
bfc8c59a08 Add encryption package requirements to SAIO instructions
libssl-dev/openssl-devel are already listed in other-requirements.txt;
add them to installation instructions in the SAIO docs.
Change-Id: I3dc07213ff8dac1299d3eb68d3448a77e15c79af
2016年07月07日 18:40:10 +01:00
Jenkins
8dcd601496 Merge "Fix intermittent bulk delete unit test failures" 2016年07月07日 17:38:35 +00:00
Maria Malyarova
008a037a36 Another amendment with missing parenthesis
TrivialFix
Change-Id: Id44ae27bc39ea97be9eb092f8a99a06056b86392
2016年07月07日 20:15:14 +03:00
Mohit Motiani
9e82891f08 Fix typo in object-server.conf and container-server.conf manpage
Change-Id: Iffad70b2fd901b305dc66d363039b7df44d619da
2016年07月07日 15:21:01 +00:00
Mohit Motiani
4c0a1481f1 Fix typo in the account-server.conf manpage
Change-Id: I4e7bb85ce746fcb1ec3a4cbf534761e4e47634c9
Closes-Bug: #1599888 
2016年07月07日 14:56:10 +00:00
Jenkins
f12135ca7c Merge "Add simple multiple server type test" 2016年07月07日 14:34:01 +00:00
Jenkins
b25d82a5c5 Merge "Call swift-recon with more than one server type" 2016年07月07日 14:27:55 +00:00
Alistair Coles
ca2f6d13b6 Fix unicode errors in object controller logging
Change swift.proxy.server.Application.error_occurred()
to decode message as utf-8 in same way that the
exception_occurred() method was changed in [1].
This prevents a unicode error when logging error responses
in swift.proxy.controllers.base.Controller._make_request()
for paths that have non-ascii characters. Although the unicode
error is currently caught by a surrounding except clause, the
logging and error limiting treatment is different for ascii
vs non-ascii paths. This patch makes them consistent.
Fix the server type reported in _make_request() to be
the correct server type, not always 'Container Server'.
Fix path arg passed to _get_conn_response in
swift.proxy.controllers.obj.BaseObjectController to be req.path
rather than req.
Add unit tests for error_occurred() being called with non-ascii
paths and extend tests for exception_occurred() (see Related-Bug).
[1] Change-Id: Icb7284eb5abc9869c1620ee6366817112d8e5587
Related-Bug: #1597210
Change-Id: I285499d164bff94835bdddb25d2af6d73114c281
2016年07月07日 13:50:17 +01:00
Kazuhiro MIYAHARA
2be1d6a77e Remove an unused variable from tests.py
The varialbe 'size' in TestFile.testMetadataNumberLimit is not used.
This patch remove the variable from the test.
Change-Id: I255a1dcee12bb6b8dec6ff26ed7edf93ab2acf64
2016年07月07日 21:28:07 +09:00
yuyafei
b53214e30b Correct reraising of exception
When an exception was caught and rethrown, it should call 'raise'
without any arguments because it shows the place where an exception
occured initially instead of place where the exception re-raised.
Change-Id: I326dd8eaf221cbf3729beedaff81b416c59ae2e6
2016年07月07日 18:27:21 +08:00
Petr Kovar
cf8b93918c Add install-guide for swift
This adds swift-specific contents from the OpenStack Installation Guide
in the swift repo per [1]. A separate change will remove the swift contents
from the OpenStack Installation Guide for Newton per [2].
The swift install-guide structure is based on the Install Guide
Cookiecutter [3].
Also adds tox.ini environment for install-guide and adds
openstackdocs-theme to test-requirements.txt.
[1] http://specs.openstack.org/openstack/docs-specs/specs/newton/project-specific-installguides.html
[2] http://specs.openstack.org/openstack/docs-specs/specs/newton/installguide.html
[3] http://git.openstack.org/cgit/openstack/installguide-cookiecutter/
Change-Id: I59b92eebaf5acc657b97bcf10d9ff2cf2db05885
Partially-Implements: blueprint projectspecificinstallguides
Depends-On: Ifebc65b188c4f2ba35b61c0deae5ec24401df7f9
2016年07月07日 08:00:21 +02:00
yuyafei
de51a6db36 Add __ne__ built-in function
In Python 3 __ne__ by default delegates to __eq__ and inverts the
result, but in Python 2 they urge you to define __ne__ when you
define __eq__ for it to work properly [1].There are no implied
relationships among the comparison operators. The truth of x==y
does not imply that x!=y is false. Accordingly, when defining
__eq__(), one should also define __ne__() so that the operators
will behave as expected.
[1]https://docs.python.org/2/reference/datamodel.html#object.__ne__
Also remove class SubStringMatcher becasue this class isn't used
following commit 7035639dfd.
Change-Id: Ia2131f72a79226b0c2f3662b84661eb870d1d692
2016年07月07日 11:28:23 +08:00
Jenkins
561284e3d4 Merge "Prevent down nodes failing PUTs with non-ascii obj names" 2016年07月06日 22:03:50 +00:00
Jenkins
d7920324f6 Merge "Change elifs to ifs" 2016年07月06日 21:31:42 +00:00
Jenkins
3f660defca Merge "Added missing parenthesis in print calls" 2016年07月06日 18:25:51 +00:00
Clay Gerrard
a2afabf283 Add basic functests for user object metadata
Change-Id: I3c3b7d051a48449400e47e366461674bed9318c5
2016年07月06日 14:48:29 +01:00
Maria Malyarova
aa12901eda Added missing parenthesis in print calls
Upd. Import print_function from __future__
TrivialFix
Change-Id: Ibcda2c7e4ddbdff2420502dfd7d17db01f3c8056
2016年07月06日 10:47:41 +00:00
Brian Cline
7568ea5dd9 Prevent down nodes failing PUTs with non-ascii obj names
On an object PUT with a non-ascii name, if we hit some kind of
exception speaking to only one object-server of the N we try to
connect to, we try to log it -- but this causes an exception when
interpolating the UTF-8 encoded path iff the message template is
unicode.
Since this is essentially an exception within an exception handler,
this fails the entire request with a 500 error -- even though the
other nodes may have been just fine. This occurs before it attempts
a handoff node.
The simplest way to reproduce this is by running func tests against
a small cluster where one of the object nodes is not running
N.B. The locale of the node does not matter because the message
template is interpolated with node/device data from the Ring which is
always unicode because of json.
This includes an update to the FakeRing used by unittest
infrastructure to ensure that the FakeRing devices make a round-trip
through json to ensure consistent typing with real Rings.
Change-Id: Icb7284eb5abc9869c1620ee6366817112d8e5587
Closes-bug: #1597210 
2016年07月05日 16:33:15 -07:00
Jenkins
79be80f126 Merge "pickle_async_update should create tmp_dir" 2016年07月05日 18:40:08 +00:00
Jenkins
9f4a662296 Merge "Stop digging for publicly_accessible ourselves" 2016年07月05日 14:15:29 +00:00
Jenkins
2bfc036bd9 Merge "Only use Timeout if we don't have a final_resp" 2016年07月05日 12:57:29 +00:00
Jenkins
1996dbefd6 Merge "Remove white space between print and ()" 2016年07月05日 12:37:12 +00:00
Tim Burke
d60662b2eb Only use Timeout if we don't have a final_resp
I'm sure the Timeout context manager is relatively cheap, but it can't
be free.
Change-Id: I71c0c5944ec372e9b983021dd024de0c5aa1ded2
2016年07月05日 10:04:29 +00:00
yuyafei
f9d5a8683d Remove white space between print and ()
TrivialFix
Change-Id: I0dca3493d43ee8642ae6d2f55597013eef261026
2016年07月05日 16:42:00 +08:00
Jenkins
00939c804c Merge "Adds migrated API reference files" 2016年07月05日 08:17:28 +00:00
Alistair Coles
9045f33869 Merge at-rest encryption feature into master
Co-Authored-By: Christian Cachin <cca@zurich.ibm.com>
Co-Authored-By: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Co-Authored-By: Peter Chng <pchng@ca.ibm.com>
Co-Authored-By: Tim Burke <tim.burke@gmail.com>
Co-Authored-By: Thiago da Silva <thiago@redhat.com>
Co-Authored-By: Clay Gerrard <clay.gerrard@gmail.com>
Co-Authored-By: Jonathan Hinson <jlhinson@us.ibm.com>
Co-Authored-By: Samuel Merritt <sam@swiftstack.com>
Co-Authored-By: Janie Richling <jrichli@us.ibm.com>
Co-Authored-By: Hamdi Roumani <roumani@ca.ibm.com>
Co-Authored-By: Kota Tsuyuzaki <tsuyuzaki.kota@lab.ntt.co.jp>
Change-Id: I1d8b030b9c8f81a232da5d6f93f442e46e331af2
2016年07月01日 00:34:33 -07:00