diff options
Diffstat (limited to 'glustolibs-gluster')
10 files changed, 32 insertions, 32 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/brick_libs.py b/glustolibs-gluster/glustolibs/gluster/brick_libs.py index 67496b88a..270b378c1 100644 --- a/glustolibs-gluster/glustolibs/gluster/brick_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/brick_libs.py @@ -29,7 +29,7 @@ from glustolibs.gluster.volume_libs import (get_subvols, is_tiered_volume, def get_all_bricks(mnode, volname): """Get list of all the bricks of the specified volume. - If the volume is 'Tier' volume, the list will contian both + If the volume is 'Tier' volume, the list will contain both 'hot tier' and 'cold tier' bricks. Args: diff --git a/glustolibs-gluster/glustolibs/gluster/brickmux_ops.py b/glustolibs-gluster/glustolibs/gluster/brickmux_ops.py index 3fcb4ee59..0a88d4b22 100644 --- a/glustolibs-gluster/glustolibs/gluster/brickmux_ops.py +++ b/glustolibs-gluster/glustolibs/gluster/brickmux_ops.py @@ -94,9 +94,9 @@ def check_brick_pid_matches_glusterfsd_pid(mnode, volname): glusterfsd_pid = pid.split()[1] if glusterfsd_pid != brick_pid: - g.log.eror("Brick pid %s doesn't macth glusterfsd " - "pid %s of the node %s", brick_pid, - glusterfsd_pid, brick_node) + g.log.error("Brick pid %s doesn't match glusterfsd " + "pid %s of the node %s", brick_pid, + glusterfsd_pid, brick_node) _rc = False return _rc diff --git a/glustolibs-gluster/glustolibs/gluster/dht_test_utils.py b/glustolibs-gluster/glustolibs/gluster/dht_test_utils.py index 0ed52c457..692f09baf 100644 --- a/glustolibs-gluster/glustolibs/gluster/dht_test_utils.py +++ b/glustolibs-gluster/glustolibs/gluster/dht_test_utils.py @@ -186,7 +186,7 @@ def find_hashed_subvol(subvols, parent_path, name): name: file or directory name - Retrun Values: + Return Values: hashed_subvol object: An object of type BrickDir type representing the hashed subvolume @@ -224,7 +224,7 @@ def find_nonhashed_subvol(subvols, parent_path, name): name: file or directory name - Retrun Values: + Return Values: nonhashed_subvol object: An object of type BrickDir type representing the nonhashed subvolume diff --git a/glustolibs-gluster/glustolibs/gluster/exceptions.py b/glustolibs-gluster/glustolibs/gluster/exceptions.py index c52dcee59..8ee443841 100644 --- a/glustolibs-gluster/glustolibs/gluster/exceptions.py +++ b/glustolibs-gluster/glustolibs/gluster/exceptions.py @@ -107,8 +107,8 @@ class ExecutionParseError(Exception): For example, the output of a command when has to be parsed, can have three states. First, the output was as expected. Second, didn't get the expected - ouput after the parsing result and Third, didn't get the expected result as - the command itself failed. + output after the parsing result and Third, didn't get the expected result + as the command itself failed. ''' pass diff --git a/glustolibs-gluster/glustolibs/gluster/heal_libs.py b/glustolibs-gluster/glustolibs/gluster/heal_libs.py index 1de540836..e71835d78 100644 --- a/glustolibs-gluster/glustolibs/gluster/heal_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/heal_libs.py @@ -60,7 +60,7 @@ def is_heal_disabled(mnode, volname): volname : Name of the volume Returns: - bool : True if heal is diabled on volume. False otherwise. + bool : True if heal is disabled on volume. False otherwise. NoneType: None if unable to get the volume status shd or parse error. """ cmd = "gluster volume status %s shd --xml" % volname diff --git a/glustolibs-gluster/glustolibs/gluster/lib_utils.py b/glustolibs-gluster/glustolibs/gluster/lib_utils.py index dcfb297c5..682152f5f 100644 --- a/glustolibs-gluster/glustolibs/gluster/lib_utils.py +++ b/glustolibs-gluster/glustolibs/gluster/lib_utils.py @@ -65,7 +65,7 @@ def append_string_to_file(mnode, filename, str_to_add_in_file, return True except IOError: - g.log.error("Exception occured while adding string to " + g.log.error("Exception occurred while adding string to " "file %s in append_string_to_file()", filename) return False finally: @@ -90,7 +90,7 @@ def search_pattern_in_file(mnode, search_pattern, filename, start_str_to_parse, file from which this method will check if the given search string is present. end_str_to_parse (str): this will be as end string in the - file whithin which this method will check + file within which this method will check if the given search string is present. Returns: @@ -288,7 +288,7 @@ def list_files(mnode, dir_path, parse_str="", user="root"): filepaths.append(filepath) return filepaths except StopIteration: - g.log.error("Exception occured in list_files()") + g.log.error("Exception occurred in list_files()") return None finally: @@ -788,7 +788,7 @@ def is_core_file_created(nodes, testrun_timestamp, List of nodes need to pass from test method testrun_timestamp: This time stamp need to pass from test method - test case runing started time, time format is EPOCH + test case running started time, time format is EPOCH time format, use below command for getting timestamp of test case 'date +%s' paths(list): diff --git a/glustolibs-gluster/glustolibs/gluster/mount_ops.py b/glustolibs-gluster/glustolibs/gluster/mount_ops.py index c0c7cc08e..637af24b1 100644 --- a/glustolibs-gluster/glustolibs/gluster/mount_ops.py +++ b/glustolibs-gluster/glustolibs/gluster/mount_ops.py @@ -322,7 +322,7 @@ def mount_volume(volname, mtype, mpoint, mserver, mclient, options='', ret, out, err = g.run(mclient, mcmd, user=user) if ret != 0: - g.log.error("net use comand failed on windows client %s " + g.log.error("net use command failed on windows client %s " "failed: %s" % (mclient, err)) return (ret, out, err) @@ -332,7 +332,7 @@ def mount_volume(volname, mtype, mpoint, mserver, mclient, options='', "Share is : %s" % (mclient, drv_ltr)) return (ret, drv_ltr, err) - g.log.error("net use comand successful but error in mount of samba " + g.log.error("net use command successful but error in mount of samba " " share for windows client %s for reason %s" % (mclient, err)) return (1, out, err) @@ -370,7 +370,7 @@ def mount_volume(volname, mtype, mpoint, mserver, mclient, options='', if "Santiago" in name: cifs_options = "sec=ntlmssp" except Exception as e: - g.log.error("Exception occured while getting the platform " + g.log.error("Exception occurred while getting the platform " "of node %s: %s", mclient, str(e)) return (1, '', '') finally: diff --git a/glustolibs-gluster/glustolibs/gluster/samba_libs.py b/glustolibs-gluster/glustolibs/gluster/samba_libs.py index 8c70b6774..bffe6a12c 100644 --- a/glustolibs-gluster/glustolibs/gluster/samba_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/samba_libs.py @@ -276,7 +276,7 @@ def share_volume_over_smb(mnode, volname, smb_users_info): cmd = ("smbclient -L localhost -U | grep -i -Fw gluster-%s " % volname) ret, _, _ = g.run(mnode, cmd) if ret != 0: - g.log.error("volume '%s' not accessable via SMB/CIFS share", volname) + g.log.error("volume '%s' not accessible via SMB/CIFS share", volname) return False g.log.info("volume '%s' can be accessed from SMB/CIFS share", volname) diff --git a/glustolibs-gluster/glustolibs/gluster/volume_libs.py b/glustolibs-gluster/glustolibs/gluster/volume_libs.py index e5a37de1c..784e61697 100644 --- a/glustolibs-gluster/glustolibs/gluster/volume_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/volume_libs.py @@ -143,7 +143,7 @@ def setup_volume(mnode, all_servers_info, volume_config, force=False): if 'dist_count' in volume_config['voltype']: kwargs['dist_count'] = (volume_config['voltype']['dist_count']) else: - g.log.error("Distibute Count not specified in the volume config") + g.log.error("Distribute count not specified in the volume config") return False number_of_bricks = kwargs['dist_count'] @@ -166,7 +166,7 @@ def setup_volume(mnode, all_servers_info, volume_config, force=False): if 'dist_count' in volume_config['voltype']: kwargs['dist_count'] = (volume_config['voltype']['dist_count']) else: - g.log.error("Distibute Count not specified in the volume config") + g.log.error("Distribute count not specified in the volume config") return False if 'replica_count' in volume_config['voltype']: @@ -203,7 +203,7 @@ def setup_volume(mnode, all_servers_info, volume_config, force=False): if 'dist_count' in volume_config['voltype']: kwargs['dist_count'] = (volume_config['voltype']['dist_count']) else: - g.log.error("Distibute Count not specified in the volume config") + g.log.error("Distribute Count not specified in the volume config") return False if 'disperse_count' in volume_config['voltype']: @@ -613,7 +613,7 @@ def is_tiered_volume(mnode, volname): Returns: bool : True if the volume is tiered volume. False otherwise - NoneType: None if volume doesnot exist. + NoneType: None if volume does not exist. """ volinfo = get_volume_info(mnode, volname) if volinfo is None: @@ -636,7 +636,7 @@ def is_distribute_volume(mnode, volname): Returns: bool : True if the volume is distributed volume. False otherwise - NoneType: None if volume doesnot exist. + NoneType: None if volume does not exist. """ volume_type_info = get_volume_type_info(mnode, volname) if volume_type_info is None: @@ -666,7 +666,7 @@ def get_volume_type_info(mnode, volname): mnode (str): Node on which commands are executed. volname (str): Name of the volume. - Retunrs: + Returns: dict : Dict containing the keys, values defining the volume type: Example: volume_type_info = { @@ -751,7 +751,7 @@ def get_cold_tier_type_info(mnode, volname): mnode (str): Node on which commands are executed. volname (str): Name of the volume. - Retunrs: + Returns: dict : Dict containing the keys, values defining the cold tier type: Example: cold_tier_type_info = { @@ -805,7 +805,7 @@ def get_hot_tier_type_info(mnode, volname): mnode (str): Node on which commands are executed. volname (str): Name of the volume. - Retunrs: + Returns: dict : Dict containing the keys, values defining the hot tier type: Example: hot_tier_type_info = { @@ -865,7 +865,7 @@ def get_num_of_bricks_per_subvol(mnode, volname): 'volume_num_of_bricks_per_subvol': None } - NoneType: None if volume doesnot exist or is a tiered volume. + NoneType: None if volume does not exist or is a tiered volume. """ bricks_per_subvol_dict = { 'is_tier': False, @@ -899,7 +899,7 @@ def get_cold_tier_num_of_bricks_per_subvol(mnode, volname): Returns: int : Number of bricks per subvol on cold tier. - NoneType: None if volume doesnot exist or not a tiered volume. + NoneType: None if volume does not exist or not a tiered volume. """ if not is_tiered_volume(mnode, volname): g.log.error("Volume %s is not a tiered volume", volname) @@ -920,7 +920,7 @@ def get_hot_tier_num_of_bricks_per_subvol(mnode, volname): Returns: int : Number of bricks per subvol on hot tier. - NoneType: None if volume doesnot exist or not a tiered volume. + NoneType: None if volume does not exist or not a tiered volume. """ if not is_tiered_volume(mnode, volname): g.log.error("Volume %s is not a tiered volume", volname) @@ -1708,8 +1708,8 @@ def shrink_volume(mnode, volname, subvol_num=None, replica_num=None, g.log.error("Failed to commit remove-brick of bricks %s on volume %s", bricks_list_to_remove, volname) return False - g.log.info("Successfully commited remove-bricks of bricks %s on volume %s", - bricks_list_to_remove, volname) + g.log.info("Successfully committed remove-bricks of bricks %s on volume " + "%s", bricks_list_to_remove, volname) # Delete the removed bricks if delete_bricks: @@ -1941,7 +1941,7 @@ def get_client_quorum_info(mnode, volname): 'quorum_count': None } } - NoneType: None if volume doesnot exist. + NoneType: None if volume does not exist. """ client_quorum_dict = { 'is_tier': False, diff --git a/glustolibs-gluster/glustolibs/gluster/volume_ops.py b/glustolibs-gluster/glustolibs/gluster/volume_ops.py index 4302f2780..e478ed979 100644 --- a/glustolibs-gluster/glustolibs/gluster/volume_ops.py +++ b/glustolibs-gluster/glustolibs/gluster/volume_ops.py @@ -377,7 +377,7 @@ def get_volume_status(mnode, volname='all', service='', options=''): Kwargs: volname (str): volume name. Defaults to 'all' service (str): name of the service to get status. - serivce can be, [nfs|shd|<BRICK>|quotad]], If not given, + service can be, [nfs|shd|<BRICK>|quotad]], If not given, the function returns all the services options (str): options can be, [detail|clients|mem|inode|fd|callpool|tasks]. If not given, |