summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Dague <sean@dague.net>2015-11-09 16:54:19 -0500
committerMatt Riedemann <mriedem@us.ibm.com>2016-05-13 11:08:15 -0400
commitd836c7172d5662207ea89a4489d41fc9b28e34f5 (patch)
tree8ff1947cfb405aec1abfc62bff0e851699f3f6f6
parentb9a1440fb6a50924d1571ef686909d0aa9149e92 (diff)
downloadnova-d836c7172d5662207ea89a4489d41fc9b28e34f5.tar.gz
skip lock_unlock_server test for cells
The cells architecture of doing db replay makes this call fundamentally racey for cells. The contract is that if you request an action on a server and it is locked, you get a 409 at the API, and are done. If you get a 2xx, the resource is not locked, and life is good. Except in cells, the API db will be updated, and the API will return all is well. Except the db replay hasn't happened for the cell, so the additional check in the nova compute for locked blows up. The fix probably involves the nova-compute check doing a timed retry under cells because of replication lags. Conflicts: devstack/tempest-dsvm-cells-rc NOTE(mriedem): The conflict is due to an additional test being skipped in liberty that wasn't skipped in mitaka. Change-Id: Ic18407b8372c286d8e258860f3e2bf76eceef2aa Related-Bug: #1466696 (cherry picked from commit 02de17c72ac0f0824df2b3d460739a58cb6b5285)
-rw-r--r--devstack/tempest-dsvm-cells-rc2
1 files changed, 2 insertions, 0 deletions
diff --git a/devstack/tempest-dsvm-cells-rc b/devstack/tempest-dsvm-cells-rc
index 7c10f0febf..75c90ccacf 100644
--- a/devstack/tempest-dsvm-cells-rc
+++ b/devstack/tempest-dsvm-cells-rc
@@ -79,6 +79,8 @@ r="$r|(?:tempest\.api\.compute.servers\.test_disk_config\.ServerDiskConfigTestJS
r="$r|(?:tempest\.api\.compute\.servers\.test_server_actions\.ServerActionsTestJSON\\.test_rebuild_server_in_stop_state*)"
# scheduler hints apparently don't work in devstack cells
r="$r|(?:tempest\.scenario\.test_server_multinode\.TestServerMultinode\.test_schedule_to_all_nodes)"
+# https://bugs.launchpad.net/nova/+bug/1466696 - Cells: Race between instance 'unlock' and 'stop' can cause 'stop' to fail
+r="$r|(?:tempest\.api\.compute\.servers\.test_server_actions\.ServerActionsTestJSON\.test_lock_unlock_server)"
r="$r).*$"
export DEVSTACK_GATE_TEMPEST_REGEX="$r"