openstack/swift
Code Issues Proposed changes

Fixed probetests

Browse Source 
* Fixed issue with running probetests with the latest update
  of python-swiftclient that removed eventlet
* Fixed issue with replication server tests to not require hard
  coded paths

Change-Id: Ibbf727ae99c0f3893ae58e270e2f879a1f618e49
This commit is contained in:
Chuck Thier 2013-05-23 22:41:04 +00:00
parent b4b35c2561
commit 7a02c218bb
2 changed files with 92 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/probe/test_container_failures.py
View File

@ -20,6 +20,7 @@ from unittest import main, TestCase
from uuid import uuid4 from uuid import uuid4
from eventlet import GreenPool, Timeout from eventlet import GreenPool, Timeout
import eventlet
from sqlite3 import connect from sqlite3 import connect
from swiftclient import client from swiftclient import client
@ -28,6 +29,7 @@ from swift.common.utils import hash_path, readconf
from test.probe.common import get_to_final_state, kill_nonprimary_server, \ from test.probe.common import get_to_final_state, kill_nonprimary_server, \
kill_server, kill_servers, reset_environment, start_server kill_server, kill_servers, reset_environment, start_server
eventlet.monkey_patch(all=False, socket=True)
def get_db_file_path(obj_dir): def get_db_file_path(obj_dir):
files = sorted(listdir(obj_dir), reverse=True) files = sorted(listdir(obj_dir), reverse=True)

75
test/probe/test_replication_servers_working.py
View File

@ -23,9 +23,9 @@ import shutil
from swiftclient import client from swiftclient import client
#from swift.common import direct_client
from test.probe.common import kill_server, kill_servers, reset_environment, \ from test.probe.common import kill_server, kill_servers, reset_environment, \
start_server start_server
from swift.common.utils import readconf
def collect_info(path_list): def collect_info(path_list):
@ -58,10 +58,10 @@ def find_max_occupancy_node(dir_list):
""" """
count = 0 count = 0
number = 0 number = 0
lenght = 0 length = 0
for dirs in dir_list: for dirs in dir_list:
if lenght < len(dirs): if length < len(dirs):
lenght = len(dirs) length = len(dirs)
number = count number = count
count += 1 count += 1
return number return number
@ -100,8 +100,15 @@ class TestReplicatorFunctions(TestCase):
# Check, that files not replicated. # Check, that files not replicated.
# Delete file "hashes.pkl". # Delete file "hashes.pkl".
# Check, that all files were replicated. # Check, that all files were replicated.
path_list = ['/srv/1/node/sdb1/', '/srv/2/node/sdb2/', path_list = []
'/srv/3/node/sdb3/', '/srv/4/node/sdb4/'] # Figure out where the devices are
for node_id in range(1,5):
conf = readconf(self.configs['object'] % node_id)
device_path = conf['app:object-server']['devices']
for dev in self.object_ring.devs:
if dev['port'] == int(conf['app:object-server']['bind_port']):
device = dev['device']
path_list.append(os.path.join(device_path, device))
# Put data to storage nodes # Put data to storage nodes
container = 'container-%s' % uuid4() container = 'container-%s' % uuid4()
@ -111,17 +118,18 @@ class TestReplicatorFunctions(TestCase):
client.put_object(self.url, self.token, container, obj, 'VERIFY') client.put_object(self.url, self.token, container, obj, 'VERIFY')
# Get all data file information # Get all data file information
(files_list, dirs_list) = collect_info(path_list) (files_list, dir_list) = collect_info(path_list)
num = find_max_occupancy_node(dirs_list) num = find_max_occupancy_node(dir_list)
test_node = path_list[num] test_node = path_list[num]
test_node_files_list = [] test_node_files_list = []
for files in files_list[num]: for files in files_list[num]:
if not files.endswith('.pending'): if not files.endswith('.pending'):
test_node_files_list.append(files) test_node_files_list.append(files)
test_node_dirs_list = dirs_list[num] test_node_dir_list = dir_list[num]
# Run all replicators # Run all replicators
processes = [] processes = []
try:
for num in xrange(1, 9): for num in xrange(1, 9):
for server in ['object-replicator', for server in ['object-replicator',
'container-replicator', 'container-replicator',
@ -133,23 +141,23 @@ class TestReplicatorFunctions(TestCase):
'forever'])) 'forever']))
# Delete some files # Delete some files
for dirs in os.listdir(test_node): for directory in os.listdir(test_node):
shutil.rmtree(test_node+dirs) shutil.rmtree(os.path.join(test_node, directory))
self.assertFalse(os.listdir(test_node)) self.assertFalse(os.listdir(test_node))
# We will keep trying these tests until they pass for up to 60s # We will keep trying these tests until they pass for up to 60s
begin = time.time() begin = time.time()
while True: while True:
(new_files_list, new_dirs_list) = collect_info([test_node]) (new_files_list, new_dir_list) = collect_info([test_node])
try: try:
# Check replicate files and dirs # Check replicate files and dir
for files in test_node_files_list: for files in test_node_files_list:
self.assertTrue(files in new_files_list[0]) self.assertTrue(files in new_files_list[0])
for dirs in test_node_dirs_list: for dir in test_node_dir_list:
self.assertTrue(dirs in new_dirs_list[0]) self.assertTrue(dir in new_dir_list[0])
break break
except Exception: except Exception:
if time.time() - begin > 60: if time.time() - begin > 60:
@ -157,48 +165,53 @@ class TestReplicatorFunctions(TestCase):
time.sleep(1) time.sleep(1)
# Check behavior by deleting hashes.pkl file # Check behavior by deleting hashes.pkl file
for dirs in os.listdir(test_node + 'objects/'): for directory in os.listdir(os.path.join(test_node, 'objects')):
for input_dirs in os.listdir(test_node + 'objects/' + dirs): for input_dir in os.listdir(os.path.join(
eval_dirs = '/' + input_dirs test_node, 'objects', directory)):
if os.path.isdir(test_node + 'objects/' + dirs + eval_dirs): if os.path.isdir(os.path.join(
shutil.rmtree(test_node + 'objects/' + dirs + eval_dirs) test_node, 'objects', directory, input_dir)):
shutil.rmtree(os.path.join(
test_node, 'objects', directory, input_dir))
# We will keep trying these tests until they pass for up to 60s # We will keep trying these tests until they pass for up to 60s
begin = time.time() begin = time.time()
while True: while True:
try: try:
for dirs in os.listdir(test_node + 'objects/'): for directory in os.listdir(os.path.join(
for input_dirs in os.listdir( test_node, 'objects')):
test_node + 'objects/' + dirs): for input_dir in os.listdir(os.path.join(
self.assertFalse(os.path.isdir(test_node + 'objects/' + test_node, 'objects', directory)):
dirs + '/' + input_dirs)) self.assertFalse(os.path.isdir(
os.path.join(test_node, 'objects',
directory, '/', input_dir)))
break break
except Exception: except Exception:
if time.time() - begin > 60: if time.time() - begin > 60:
raise raise
time.sleep(1) time.sleep(1)
for dirs in os.listdir(test_node + 'objects/'): for directory in os.listdir(os.path.join(test_node, 'objects')):
os.remove(test_node + 'objects/' + dirs + '/hashes.pkl') os.remove(os.path.join(
test_node, 'objects', directory, 'hashes.pkl'))
# We will keep trying these tests until they pass for up to 60s # We will keep trying these tests until they pass for up to 60s
begin = time.time() begin = time.time()
while True: while True:
try: try:
(new_files_list, new_dirs_list) = collect_info([test_node]) (new_files_list, new_dir_list) = collect_info([test_node])
# Check replicate files and dirs # Check replicate files and dirs
for files in test_node_files_list: for files in test_node_files_list:
self.assertTrue(files in new_files_list[0]) self.assertTrue(files in new_files_list[0])
for dirs in test_node_dirs_list: for directory in test_node_dir_list:
self.assertTrue(dirs in new_dirs_list[0]) self.assertTrue(directory in new_dir_list[0])
break break
except Exception: except Exception:
if time.time() - begin > 60: if time.time() - begin > 60:
raise raise
time.sleep(1) time.sleep(1)
finally:
for process in processes: for process in processes:
process.kill() process.kill()