Skip to content

Commit a8526b0

Browse files
different logs for converter and compressor
1 parent 5e5ea7e commit a8526b0

1 file changed

Lines changed: 19 additions & 11 deletions

File tree

components/job-orchestration/job_orchestration/executor/compress/compression_task.py

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -429,18 +429,24 @@ def cleanup_temporary_files():
429429
converted_inputs_dir,
430430
)
431431

432-
# Open stderr log file
433-
stderr_log_path = logs_dir / f"{instance_id_str}-stderr.log"
434-
stderr_log_file = open(stderr_log_path, "w")
432+
# Open log files
433+
compression_log_path = logs_dir / f"{instance_id_str}-stderr.log"
434+
compression_log_file = open(compression_log_path, "w")
435+
conversion_log_path = logs_dir / f"{instance_id_str}-conversion-stderr.log"
436+
conversion_log_file = open(conversion_log_path, "w")
435437

436438
conversion_return_code = 0
437439
if conversion_cmd is not None:
438440
logger.debug("Execute log-converter with command: %s", conversion_cmd)
439441
conversion_proc = subprocess.Popen(
440-
conversion_cmd, stdout=subprocess.DEVNULL, stderr=stderr_log_file, env=conversion_env
442+
conversion_cmd,
443+
stdout=subprocess.DEVNULL,
444+
stderr=conversion_log_file,
445+
env=conversion_env,
441446
)
442447
conversion_return_code = conversion_proc.wait()
443-
448+
conversion_log_file.close()
449+
444450
try:
445451
if conversion_return_code != 0:
446452
logger.error(
@@ -449,15 +455,17 @@ def cleanup_temporary_files():
449455
worker_output = {
450456
"total_uncompressed_size": 0,
451457
"total_compressed_size": 0,
452-
"error_message": f"Check logs in {stderr_log_path}",
458+
"error_message": f"Check logs in {conversion_log_path}",
453459
}
460+
log_file_contents(logger, conversion_log_path)
461+
454462
return CompressionTaskStatus.FAILED, worker_output
455463

456464
# Start compression
457465
logger.debug("Compressing...")
458466
compression_successful = False
459467
proc = subprocess.Popen(
460-
compression_cmd, stdout=subprocess.PIPE, stderr=stderr_log_file, env=compression_env
468+
compression_cmd, stdout=subprocess.PIPE, stderr=compression_log_file, env=compression_env
461469
)
462470

463471
# Compute the total amount of data compressed
@@ -536,7 +544,7 @@ def cleanup_temporary_files():
536544
subprocess.run(
537545
indexer_cmd,
538546
stdout=subprocess.DEVNULL,
539-
stderr=stderr_log_file,
547+
stderr=compression_log_file,
540548
check=True,
541549
env=indexer_env,
542550
)
@@ -559,8 +567,8 @@ def cleanup_temporary_files():
559567
logger.debug("Compressed.")
560568
finally:
561569
cleanup_temporary_files()
562-
stderr_log_file.close()
563-
log_file_contents(logger, stderr_log_path)
570+
compression_log_file.close()
571+
log_file_contents(logger, compression_log_path)
564572

565573
worker_output = {
566574
"total_uncompressed_size": total_uncompressed_size,
@@ -571,7 +579,7 @@ def cleanup_temporary_files():
571579
return CompressionTaskStatus.SUCCEEDED, worker_output
572580
error_msgs = []
573581
if compression_successful is False:
574-
error_msgs.append(f"See logs {stderr_log_path}")
582+
error_msgs.append(f"See logs {compression_log_path}")
575583
if s3_error is not None:
576584
error_msgs.append(s3_error)
577585
worker_output["error_message"] = "\n".join(error_msgs)

0 commit comments

Comments
 (0)