88238108f824e14fca8ca6adb3ec0e72df87fdf9
Commit Graph

5824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Dickinson
88238108f8 authors and changelog updates for 2.9.0 release
Change-Id: I3c3e779227aad1df6abb517817355c6732e4a2af
2.9.0
2016年07月13日 15:42:16 -05:00
Jenkins
d6c3f6d554 Merge "Add keymaster_config_path option to keymaster" 2016年07月13日 15:38:10 +00:00
Jenkins
1ba56c64e9 Merge "Fixed inconsistencies in docstrings" 2016年07月11日 21:23:29 +00:00
Jenkins
2ee1710b68 Merge "make 0 be avaiable value of options" 2016年07月11日 20:14:03 +00:00
Tim Burke
6740a7badd Add keymaster_config_path option to keymaster
Also, tighten up the format checks on root secrets.
Change-Id: I1cd9a97c4e8d87d7c065866e7ad3a9e748ff19ab
2016年07月11日 19:42:35 +00:00
Jenkins
0144fb5d89 Merge "Don't encrypt update override etags for empty object" 2016年07月11日 17:45:35 +00:00
Cheng Li
5817f00005 make 0 be avaiable value of options
value 0 is regard as not available by swift-ring-builder
$ swift-ring-builder testring add --region 0 --zone 1
--ip 127.0.0.2 --port 6000 --device sdb --weight 100
Required argument -r/--region not specified.
The on-disk ring builder is unchanged.
this patch is to make value 0 available.
Change-Id: Id941d44d8dbfe438bf921ed905908b838c88a644
Closes-bug: #1547137 
2016年07月10日 20:33:05 +08:00
Jenkins
1ac9ceb548 Merge "Add description of server options (all, main, rest) for swift-init help" 2016年07月08日 23:31:20 +00:00
Jenkins
d8fcdb5778 Merge "Added unit test cases for cli/recon.py" 2016年07月08日 23:30:42 +00:00
Jenkins
fa1f67b116 Merge "Add ringbuilder tests for --yes option" 2016年07月08日 23:30:34 +00:00
Jenkins
8624da07b5 Merge "Turn on H233 and start using print function" 2016年07月08日 23:13:38 +00:00
Jenkins
521ec6b9b1 Merge "Add region in swift-ring-builder add" 2016年07月08日 23:12:39 +00:00
Mohit Motiani
6b6fa69349 Add description of server options (all, main, rest) for swift-init help
Running swift-init with -h, --help, or no arguments
displays help for the command. The help does not
document the 'main', 'all', and 'rest' options.
These are documented in the man page.
This patch adds all these server options in the
help of swift-init.
Change-Id: I8e27589912ae72ace14c955e66b86942bc23d9f7
Closes-Bug: #1580722 
2016年07月08日 13:53:46 -04:00
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
Mohit Motiani
54ed084234 Add region in swift-ring-builder add
In the swift deployment guide, region is missing from the syntax of
adding a new device to the swift-ring-builder.
This patch adds region in the syntax.
Change-Id: I43e247c92d461efd530c0f82ca3daddcb9e2ba5b
Closes-Bug: #1584127 
2016年07月08日 15:55:49 +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
Alistair Coles
a53b12a62c Don't encrypt update override etags for empty object
Fix an anomaly where object metadata for an empty object has no
encrypted etag, but if the encrypter received a container update
override etag in footers or headers then it would encrypt that,
so we'd have encrypted metadata in the container listing but not
in the object metadata. (Empty object etags are not encrypted
because the object content is revealed by its size anyway).
This patch changes the override handling to not encrypt override
etags that correspond to an empty object, with one exception: if
for some reason the received override etag value is that of an empty
string but there *was* an object body, then we'll encrypt the
override etag, because it's value is not obvious from the object
size.
Change-Id: I8d7da34d6d98f351f59174883bc4d5ed0416c101
2016年07月07日 16:27:06 +01: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
Christian Schwede
e5a6d45882 Add ringbuilder tests for --yes option
Also added a Timeout class to test.unit to wrap possible long-running
functions. For example, if there is some regression and the "--yes"
argument is no longer evaluated correctly and the test excepts some
keyboard input, it will be terminated after a few seconds to ensure
there is no long-running blocker on the gate.
Change-Id: I07b17d21d5af7fcc594ce5319ae2b6f7f58df4bb
2016年07月07日 14:49:43 +02: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