openstack/manila
Code Issues Proposed changes

Fix HDS HNAS snapshot creation tracking

Browse Source 
HDS HNAS driver fails when tracking HNAS tree-clone-job status,
thus it incorrectly triggers snapshot creation timeout. This occurs
because the JobStatus class cannot successfully parse the HNAS
tree-clone-job status command output. This patch fixes these class
issues.

Change-Id: I9e5f45c48966381afba06204b9106eb11d33398c
Closes-Bug: #1495564
This commit is contained in:
Tiago Pasqualini
2015-09-14 12:16:13 -03:00
parent 94e62e1a41
commit 4fc8f58412
2 changed files with 36 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
manila/share/drivers/hitachi/ssh.py
View File

@@ -776,55 +776,41 @@ class Export(object):
class JobStatus(object):
def __init__(self, data):
if data:
split_data = data.replace(",", "").split()
lines = data.split("\n")
self.job_id = split_data[4]
self.pysical_node = split_data[14]
self.evs = split_data[17]
self.volume_number = split_data[21]
self.fs_id = split_data[26]
self.fs_name = split_data[31]
self.source_path = split_data[35]
self.creation_time = split_data[39] + " " + split_data[40]
self.destination_path = split_data[44]
self.ensure_destination_path_exists = split_data[50]
self.job_id = lines[0].split()[3]
self.physical_node = lines[2].split()[3]
self.evs = lines[3].split()[2]
self.volume_number = lines[4].split()[3]
self.fs_id = lines[5].split()[4]
self.fs_name = lines[6].split()[4]
self.source_path = lines[7].split()[3]
self.creation_time = " ".join(lines[8].split()[3:5])
self.destination_path = lines[9].split()[3]
self.ensure_path_exists = lines[10].split()[5]
self.job_state = " ".join(lines[12].split()[3:])
self.job_started = " ".join(lines[14].split()[2:4])
self.job_ended = " ".join(lines[15].split()[2:4])
self.job_status = lines[16].split()[2]
if split_data[55] == 'failed':
self.job_state = " ".join(split_data[54:56])
error_details_line = lines[17].split()
if len(error_details_line) > 3:
self.error_details = " ".join(error_details_line[3:])
else:
self.job_state = " ".join(split_data[54:57])
self.error_details = None
for i in range(55, len(split_data)):
if split_data[i] == "Started":
self.job_started = " ".join(split_data[i + 2:i + 4])
elif split_data[i] == "Ended":
self.job_ended = " ".join(split_data[i + 2:i + 4])
elif split_data[i] == "Status":
self.job_status = split_data[i + 2]
elif " ".join(split_data[i:i + 2]) == "Error details":
self.error_details = \
split_data[i + 2] if split_data[i + 2] != ":" else ""
elif " ".join(split_data[i:i + 2]) == "Directories processed":
self.directories_processed = split_data[i + 3]
elif " ".join(split_data[i:i + 2]) == "Files processed":
self.files_processed = split_data[i + 3]
elif " ".join(split_data[i:i + 3]) == "Data bytes processed":
self.data_bytes_processed = split_data[i + 4]
elif " ".join(split_data[i:i + 3]) == "Source directories " \
"missing":
self.directories_missing = split_data[i + 4]
elif " ".join(split_data[i:i + 3]) == "Source files missing":
self.files_missing = split_data[i + 4]
elif " ".join(split_data[i:i + 3]) == "Source files skipped":
self.files_skipped = split_data[i + 4]
elif split_data[i] == "symlinks":
self.symlinks_skipped = split_data[i - 1]
elif " ".join(split_data[i:i + 2]) == "hard links":
self.hard_links_skipped = split_data[i - 1]
elif " ".join(split_data[i:i + 3]) == "block special devices":
self.block_special_devices_skipped = split_data[i - 1]
elif " ".join(split_data[i:i + 2]) == "character devices":
self.character_devices_skipped = split_data[i - 1]
self.directories_processed = lines[18].split()[3]
self.files_processed = lines[19].split()[3]
self.data_bytes_processed = lines[20].split()[4]
self.directories_missing = lines[21].split()[4]
self.files_missing = lines[22].split()[4]
self.files_skipped = lines[23].split()[4]
skipping_details_line = lines[24].split()
if len(skipping_details_line) > 3:
self.skipping_details = " ".join(skipping_details_line[3:])
else:
self.skipping_details = None
class JobSubmit(object):

15
manila/tests/share/drivers/hitachi/test_ssh.py
View File

@@ -295,9 +295,7 @@ vol3
usage bytes : 5 GB (5368709120 B) files: 2
last modified: 2015-07-28 20:23:05.672404600+00:00"""
HNAS_RESULT_tree_job_status_fail = """
tree-clone-job-status: Job id = d933100a-b5f6-11d0-91d9-836896aada5d
JOB ID : d933100a-b5f6-11d0-91d9-836896aada5d
HNAS_RESULT_tree_job_status_fail = """JOB ID : d933100a-b5f6-11d0-91d9-836896aada5d
Job request
Physical node : 1
EVS : 1
@@ -310,7 +308,6 @@ tree-clone-job-status: Job id = d933100a-b5f6-11d0-91d9-836896aada5d
Ensure destination path exists : true
Job state : Job failed
Job info
Started : 2013-09-05 23:16:48-07:00
Ended : 2013-09-05 23:17:02-07:00
@@ -328,9 +325,7 @@ tree-clone-job-status: Job id = d933100a-b5f6-11d0-91d9-836896aada5d
HNAS_RESULT_job = """tree-operation-job-submit: Request submitted successfully.
tree-operation-job-submit: Job id = d933100a-b5f6-11d0-91d9-836896aada5d """
HNAS_RESULT_job_completed = """
tree-clone-job-status: Job id = ab4211b8-aac8-11ce-91af-39e0822ea368
JOB ID : ab4211b8-aac8-11ce-91af-39e0822ea368
HNAS_RESULT_job_completed = """JOB ID : ab4211b8-aac8-11ce-91af-39e0822ea368
Job request
Physical node : 1
EVS : 1
@@ -341,6 +336,7 @@ HNAS_RESULT_job_completed = """
Creation time : 2013-09-05 23:16:48-07:00
Destination path : "/clone/bar"
Ensure destination path exists : true
Job state : Job was completed
Job info
Started : 2013-09-05 23:16:48-07:00
@@ -357,9 +353,7 @@ HNAS_RESULT_job_completed = """
block special devices, 25 character devices
"""
HNAS_RESULT_job_running = """
tree-clone-job-status: Job id = ab4211b8-aac8-11ce-91af-39e0822ea368
JOB ID : ab4211b8-aac8-11ce-91af-39e0822ea368
HNAS_RESULT_job_running = """JOB ID : ab4211b8-aac8-11ce-91af-39e0822ea368
Job request
Physical node : 1
EVS : 1
@@ -370,6 +364,7 @@ HNAS_RESULT_job_running = """
Creation time : 2013-09-05 23:16:48-07:00
Destination path : "/clone/bar"
Ensure destination path exists : true
Job state : Job is running
Job info
Started : 2013-09-05 23:16:48-07:00