Commit 3e23a769 authored by Paul Rich's avatar Paul Rich
Browse files

Merge branch 'develop' into 90-fix-startup-race-condition

parents 04c9ed87 fe04ae24
= Changes from previous Cobalt Versions =
== Changes to 1.0.20 ==
* Fix for certain IO error messages that were ambiguous.
* Fix for an issue where attrs on a job are changed as a part of a filter script while
using qmove that can cause attrs to become a string instead of a dictionary and
disrupt scheduling on a queue.
== Changes to 1.0.19 ==
* Hotfix for issue preventing rereservations for interactive jobs from being detected.
......@@ -12,7 +18,7 @@
jobs and reservations to be used with tools like pdsh
== Changes to 1.0.17 ==
* Added queue and project information to enviornment in Cray jobs.
* Added queue and project information to environment in Cray jobs.
== Changes to 1.0.15 ==
* Fix for an issue on Cray systems where Cobalt was not properly passing
......
......@@ -1032,44 +1032,40 @@ class disk_writer_thread(Thread):
#on open, even though I believe the linux kernel gets this wrong.
fd = os.open(file_msg.filename, os.O_WRONLY|os.O_APPEND|os.O_NONBLOCK)
except IOError as (num, strerror):
errcode = errno.errorcode[num]
if num == errno.EACCES:
logger.error("Unable to write to %s with error code: "
"%s. Permission Denied.", errcode,
file_msg.filename)
logger.error("Unable to write to %s with error code: %s. Permission Denied.", file_msg.filename, errcode)
messages_to_remove.append(file_msg)
elif num == errno.EDQUOT:
logger.error("Unable to write to %s. Quota Exceeded.", file_msg.filename)
logger.error("Unable to write to %s with error code: %s. Quota Exceeded.", file_msg.filename, errcode)
messages_to_remove.append(file_msg)
elif num in [errno.EFAULT,errno.EINVAL,errno.EIO]:
logger.error("Unable to write to %s. Fatal Error.", file_msg.filename)
logger.error("Unable to write to %s with error code: %s. Fatal Error.", file_msg.filename, errcode)
messages_to_remove.append(file_msg)
elif num == errno.ENXIO:
logger.error("Why are you trying to open a pipe?")
messages_to_remove.append(file_msg)
else:
logger.debug("Failed to write to %s. Holding message for retry.",
file_msg.filename)
logger.debug("Failed to write to %s with error code: %s. Holding message for retry.",
file_msg.filename, errcode)
continue
except OSError as (num, strerror):
errcode = errno.errorcode[num]
if num == errno.EACCES:
logger.error("Unable to write to %s. Permission Denied.",file_msg.filename)
logger.error("OSError: Unable to write to %s with error code: %s. Permission Denied.",file_msg.filename, errcode)
messages_to_remove.append(file_msg)
elif num == errno.EDQUOT:
logger.error("Unable to write to %s. Quota Exceeded.", file_msg.filename)
logger.error("OSError: Unable to write to %s with error code: %s. Quota Exceeded.", file_msg.filename, errcode)
messages_to_remove.append(file_msg)
elif num in [errno.EFAULT,errno.EINVAL,errno.EIO]:
logger.error("Unable to write to %s. Fatal Error.", file_msg.filename)
logger.error("OSError: Unable to write to %s with error code: %s. Fatal Error.", file_msg.filename, errcode)
messages_to_remove.append(file_msg)
elif num == errno.ENXIO:
logger.error("Why are you trying to open a pipe?")
logger.error("OSError: Why are you trying to open a pipe?")
messages_to_remove.append(file_msg)
else:
logger.debug("Failed to write to %s. Holding message for retry.",
file_msg.filename)
logger.debug("OSError: Failed to write to %s with error code: %s. Holding message for retry.",
file_msg.filename, errcode)
continue
except Exception:
logger.critical("Unknown error recieved when writing to cobaltlog %s. "\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment