--- /tmp/SfsManager 2014-11-26 10:33:16.000000000 -0600 +++ ./SfsManager 2014-11-21 00:22:07.000000000 -0600 @@ -203,10 +203,12 @@ netmist_cmd += " -z" if rc.parms["USE_RSHRCP"] == 1: netmist_cmd += " -u" + if rc.parms["NO_OP_VALIDATE"] == 1: + netmist_cmd += " -3" if rc.parms["FILE_ACCESS_LIST"] == 1: netmist_cmd += " -Y" - if rc.parms["TRACEDEBUG"] == 1: - netmist_cmd += " -2" + if rc.parms["TRACEDEBUG"]: + netmist_cmd += " -2 %d" % rc.parms["TRACEDEBUG"] if rc.parms["SHARING_MODE"] == 1: netmist_cmd += " -X" if rc.parms["SOCK_DEBUG"] == 1: @@ -724,6 +726,7 @@ "LOCAL_ONLY": 0, "FILE_ACCESS_LIST": 0, "TRACEDEBUG": 0, + "NO_OP_VALIDATE": 0, "SHARING_MODE": 0, "SOCK_DEBUG": 0, "NETMIST_LOGS": ""} @@ -786,18 +789,20 @@ elif multiplier == "g": num *= (1024 * 1024) self.file_size = num - elif parm == "BYTE_OFFSET": + # validate greater than or equal to zero parameters (integer) + elif parm in ['BYTE_OFFSET', 'TRACEDEBUG']: if value != "": try: i = int(value) if i >= 0: - self.parms["BYTE_OFFSET"] = i + self.parms[parm] = i else: - message(("Invalid value for BYTE_OFFSET, must be" - "greater than or equal to zero"), "[ERROR]", True, - self.log, True) + message(("Invalid value for %s, must be" + " greater than or equal to zero" % parm), "[ERROR]", + True, self.log, True) except ValueError: - message("Invalid value for BYTE_OFFSET", "[ERROR]", True, + message(("Invalid value for %s, must be greater than" + " or equal to zero" % parm), "[ERROR]", True, self.log, True) # validate positive integer value parameters elif parm in ['DIR_COUNT', 'FILES_PER_DIR', 'MAX_FD', 'PIT_PORT']: @@ -815,8 +820,8 @@ # validate boolean value parameters, convert to 1 or 0 elif parm in ['IPV6_ENABLE', 'UNLINK_FILES', 'DISABLE_FSYNCS', \ 'USE_RSHRCP', 'LOCAL_ONLY', 'HEARTBEAT_NOTIFICATIONS', \ - 'LATENCY_GRAPH', 'FILE_ACCESS_LIST', 'TRACEDEBUG', \ - 'SHARING_MODE', 'SOCK_DEBUG']: + 'LATENCY_GRAPH', 'FILE_ACCESS_LIST', 'SHARING_MODE', \ + 'SOCK_DEBUG','NO_OP_VALIDATE']: if value != "": retval = check_string_bool(value) if retval == -1: