openstack/swift
Code Issues Proposed changes

probe tests: Run relinker via subprocess

Browse Source 
Otherwise, test-run state (eventlet.tpool initialization, in particular)
can bleed over and cause hangs.

Closes-Bug: #2088026
Change-Id: I4f7dd0755b8dc8806d9b9046ac192d94ca705383
This commit is contained in:
Tim Burke 2024-11-12 15:39:15 -08:00
parent 309b906df8
commit b262b16d55
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/probe/test_object_partpower_increase.py
View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
import os import os
import subprocess
from errno import EEXIST from errno import EEXIST
from shutil import copyfile, move from shutil import copyfile, move
@ -24,7 +25,6 @@ from uuid import uuid4
from swiftclient import client from swiftclient import client
from swift.cli.relinker import main as relinker_main
from swift.common.manager import Manager, Server from swift.common.manager import Manager, Server
from swift.common.ring import RingBuilder from swift.common.ring import RingBuilder
from swift.common.utils import replace_partition_in_path, readconf from swift.common.utils import replace_partition_in_path, readconf
@ -114,7 +114,7 @@ class TestPartPowerIncrease(ProbeTest):
# Relink existing objects # Relink existing objects
for conf in self.conf_files: for conf in self.conf_files:
self.assertEqual(0, relinker_main(['relink', conf])) subprocess.check_call(['swift-object-relinker', 'relink', conf])
# Create second object after relinking and ensure it is accessible # Create second object after relinking and ensure it is accessible
client.put_object(self.url, self.token, container, obj2, self.data) client.put_object(self.url, self.token, container, obj2, self.data)
@ -166,7 +166,7 @@ class TestPartPowerIncrease(ProbeTest):
# Cleanup old objects in the wrong location # Cleanup old objects in the wrong location
for conf in self.conf_files: for conf in self.conf_files:
self.assertEqual(0, relinker_main(['cleanup', conf])) subprocess.check_call(['swift-object-relinker', 'cleanup', conf])
# Ensure objects are still accessible # Ensure objects are still accessible
client.head_object(self.url, self.token, container, obj) client.head_object(self.url, self.token, container, obj)