7627 Commits

Author SHA1 Message Date
Tim Burke
7ae2cc4cc8 Address some review comments
There's already a nice way to reap a process if it's exited while not
waiting, and it doesn't require timeouts.

Change-Id: Ie327fecb6a3055ff146a94e1171ec0ec68d7179f
Related-Change: If6dc7b003e18ab4e8a5ed687c965025ebd417dfa
2018-06-27 17:17:19 -07:00
Zuul
4c2ef69d31 Merge "Log unexpected errors when trying to clean up empty dirs" 2018-06-27 09:06:14 +00:00
Tim Burke
01fb3efdae Log unexpected errors when trying to clean up empty dirs
Change-Id: I6a0640ba2287dca4eb85e226b809f7b009ef6c17
Related-Change: I2849a757519a30684646f3a6f4467c21e9281707
2018-06-26 15:23:11 -07:00
Samuel Merritt
50ea4e1e08 py3: port healthcheck
Typed "b" in a half-dozen places and fixed a typo in a test name.

Change-Id: Idcb8b2eeef5b545eb0944cc22b7c7961e8c2f8f0
2018-06-26 13:20:49 -07:00
John Dickinson
0edfb879a7 reorganized existing ansible playbooks
Change-Id: Ib08c2c4c685eb30a4c804ece0b667575c04d2ca0
2018-06-25 13:47:45 -07:00
Alistair Coles
1fa4b9e3fe Remove unnecessary loop in test_keymaster.py
The ignored_secret variable wasn't being used.

Change-Id: Ia659f3672941f9bb86054ce6cafbbe6fe7ccafbc
Related-Change: I1cd9a97c4e8d87d7c065866e7ad3a9e748ff19ab
2018-06-25 12:13:59 +01:00
Zuul
3de21d945b Merge "Remove empty part dirs during ssync replication" 2018-06-23 02:19:18 +00:00
Zuul
fc9b9e55c5 Merge "container-updater: Always report zero objects/bytes used for shards" 2018-06-22 21:45:56 +00:00
Zuul
84ddb8c1ec Merge "py3: port catch_errors" 2018-06-22 21:41:21 +00:00
Zuul
9c0de5d74f Merge "py3: fix test_proxy_logging.py" 2018-06-22 21:41:19 +00:00
Zuul
c81663b7be Merge "Add clarifying comment about surrogate check" 2018-06-22 21:41:11 +00:00
Zuul
d3f29663cb Merge "fix misspelling of 'server'" 2018-06-22 20:14:22 +00:00
Zuul
dd760bff0a Merge "rename swob.str_from_wsgi -> swob.wsgi_to_str" 2018-06-22 15:12:12 +00:00
Zuul
4b54697800 Merge "Reverse shard ranges later" 2018-06-22 12:13:43 +00:00
Zuul
2a7190ba13 Merge "py3: Port common/swob" 2018-06-22 11:54:36 +00:00
Zuul
1c42cb529c Merge "py3: Port common/constraints" 2018-06-22 11:48:41 +00:00
Zuul
d280c4c356 Merge "py36: Fix test_get_logger_sysloghandler_plumbing" 2018-06-22 11:48:38 +00:00
lvxianguo
f0e46857b7 fix misspelling of 'server'
Change-Id: I61f916d5734708a821c8d51961fc2d222967f6e8
2018-06-22 18:32:28 +08:00
Tim Burke
5652dec43b container-updater: Always report zero objects/bytes used for shards
Otherwise, a sharded container AUTH_test/sharded will have its stats
included in the totals for both AUTH_test *and* .shards_AUTH_test

Co-Authored-By: Alistair Coles <alistairncoles@gmail.com>
Change-Id: I7fa74e13347601c5f44fd7e6cf65656cc3ebc2c5
2018-06-22 10:35:36 +01:00
Zuul
640ca2989b Merge "Add py36 testenv" 2018-06-22 03:09:04 +00:00
Zuul
017aacd850 Merge "Have check_drive raise ValueError on errors" 2018-06-22 00:55:20 +00:00
Samuel Merritt
a5a6a274dc rename swob.str_from_wsgi -> swob.wsgi_to_str
This way we have wsgi_to_str and str_to_wsgi; this makes it easier to
read and to tab-complete than having str_from_wsgi and str_to_wsgi
where the important part is the middle word.

Change-Id: Ibab626355d8730dcd99c9e5720186ce77faf7ab8
2018-06-21 17:46:39 -07:00
Samuel Merritt
3920b88daa py3: port catch_errors
Today's diff is brought to you by the letter "b".

Change-Id: I074c1ff3f1232a899c101f2856dff4a881a6fe77
2018-06-21 17:23:41 -07:00
Samuel Merritt
e0b4eb225c py3: fix test_proxy_logging.py
Only the tests needed to change, and it was nearly all just prepending
"b" to a bunch of string literals.

Change-Id: Id5317e471c04a05627438c281bb0d6a97cf6a8a4
2018-06-21 17:18:42 -07:00
Tim Burke
5b79ce90d2 Reverse shard ranges later
... so we have fewer special cases to consider.

Change-Id: Ifd6c7357303789991087371d077ecfec5d6ff1fa
2018-06-21 16:25:33 -07:00
Tim Burke
1318bacc17 py36: Fix test_get_logger_sysloghandler_plumbing
Change-Id: Ibdb9e2bbec1c962d930a3f69fc95a8c562ac13b7
2018-06-21 15:43:26 -07:00
Samuel Merritt
ba0b3c3b68 Add clarifying comment about surrogate check
Change-Id: I55229e846c7c576ba189787abc9f983558f463a8
2018-06-21 14:28:41 -07:00
Zuul
dfbc6f5ea8 Merge "specify test selector with py3 packages in bindep" 2018-06-21 01:05:56 +00:00
Tim Burke
f192f51d37 Have check_drive raise ValueError on errors
...which helps us differentiate between a drive that's not mounted vs.
not a dir better in log messages. We were already doing that a bit in
diskfile.py, and it seems like a useful distinction; let's do it more.

While we're at it, remove some log translations.

Related-Change: I941ffbc568ebfa5964d49964dc20c382a5e2ec2a
Related-Change: I3362a6ebff423016bb367b4b6b322bb41ae08764
Change-Id: Ife0d34f9482adb4524d1ab1fe6c335c6b287c2fd
Partial-Bug: 1674543
2018-06-20 17:15:07 -07:00
Tim Burke
2b19c26498 py3: Port common/swob
Change-Id: I31408f525ba9836f634a35581d4aee6fa2c9428f
2018-06-20 16:52:02 -07:00
Tim Burke
0694e51eb7 py3: Port common/constraints
Alternate approach to https://review.openstack.org/#/c/559902

Change-Id: I1e244c231753b8f4b6f1cf95cb0ae4c3c959ae0f
2018-06-20 16:51:25 -07:00
Tim Burke
2637fec004 Add py36 testenv
Ubuntu 18.04 ships 3.6.5; may as well have a testenv handy for it.

Change-Id: Ibea05bc879685fab148cde1b19510e83f0639f5d
2018-06-20 16:51:25 -07:00
Zuul
c568b4b100 Merge "Resolve TODO's in test/probe/test_sharder.py" 2018-06-20 23:48:23 +00:00
John Dickinson
f21bbe0cbe specify test selector with py3 packages in bindep
Change-Id: I916b9d6e62c0f3781408a90e72c17339658a25f0
2018-06-20 14:43:59 -07:00
Alistair Coles
a59c5e3bae Resolve TODO's in test/probe/test_sharder.py
Resolve outstanding TODO's. One TODO is removed because there isn't an
easy way to arrange for an async pending to be targeted at a shard
container.

Change-Id: I0b003904f73461ddb995b2e6a01e92f14283278d
2018-06-20 19:42:32 +00:00
Zuul
c3ea2f0909 Merge "Use valid eventlet logger method" 2018-06-20 18:48:18 +00:00
Zuul
c34330e420 Merge "Fix test_wsgi.py tests failing with eventlet <=0.18.4" 2018-06-20 18:23:07 +00:00
Alistair Coles
554c07aa5f Fix the example webhook middleware
Change-Id: I242dc8bc655a1d1243c2d4bd51fc62e4dcadc67b
2018-06-20 10:49:30 +01:00
Alistair Coles
a1cb919930 Use valid eventlet logger method
eventlet<=0.17.4 LoggerFileWrapper does not have an error() method
so don't try to call it. Instead, use info() which even in newer
eventlet versions does exactly the same as error().

This bug only manifests in unit tests once the Related-Bug has been fixed
(see Related-Change).

Closes-Bug: #1777836
Related-Bug: #1777701
Related-Change: I68fd9d0263a6720aaf0d90b8ea6da1158105ac01

Change-Id: I46190567549826c811ffa51e9a71a38a20d9ce97
2018-06-20 10:20:58 +01:00
Alistair Coles
642d8748c0 Fix test_wsgi.py tests failing with eventlet <=0.18.4
Older versions of eventlet expect getsocketname() to return a tuple,
and newer versions are happy to receive a tuple, so fix the mock to
return a tuple.

Change-Id: I68fd9d0263a6720aaf0d90b8ea6da1158105ac01
Closes-Bug: #1777701
2018-06-20 09:59:55 +01:00
Zuul
1cd6416471 Merge "Fix common/test_utils.py on Python 3.5.4+" 2018-06-20 03:15:49 +00:00
Zuul
298f8b4df1 Merge "Tighten up staticweb redirect test" 2018-06-19 23:50:24 +00:00
Zuul
fd76a1b380 Merge "s3api: Stop debug-logging the entire wsgi environment" 2018-06-18 17:42:10 +00:00
Zuul
4aca486fc4 Merge "func tests: Rename storage_url to storage_path" 2018-06-16 02:36:16 +00:00
Zuul
70d46d311b Merge "Rename test_except.py -> test_catch_errors.py" 2018-06-16 01:41:46 +00:00
Zuul
64642b981b Merge "Blacklist eventlet 0.23.0" 2018-06-16 00:54:15 +00:00
Samuel Merritt
b08355ea3f Rename test_except.py -> test_catch_errors.py
Every other middleware has files swift/common/middleware/<mw>.py and
test/unit/common/middleware/test_<mw>.py, while catch_errors has
test_except.py, which makes its tests harder to find. Let's follow the
same naming pattern.

Change-Id: I534ff57ac2fe8e12a3f84d821da04d679f1ced3a
2018-06-15 15:17:04 -07:00
Zuul
8dbf5df50c Merge "Set lower bounds on all requirements and test-requirements" 2018-06-15 21:31:10 +00:00
Zuul
cdb1736e01 Merge "Only try to fetch or sync shard ranges if the remote supports sharding" 2018-06-15 21:30:51 +00:00
Tim Burke
ac69a71a83 s3api: Stop debug-logging the entire wsgi environment
Previously, you could not safely turn on debug logging in a production system.

Change-Id: I2a1cbd540ebb57a4c227a08e37f5b64f7ac8ca35
2018-06-15 13:02:13 -07:00