Project

General

Profile

« Previous | Next » 

Revision 60440

updated hadoop aggregation workflow reporting

View differences:

modules/dnet-openaireplus-workflows/trunk/src/main/java/eu/dnetlib/msro/openaireplus/workflows/nodes/dhp/message/DnetMessageManager.java
20 20
	private long maxNumberOfMessages;
21 21

  
22 22
	public synchronized void registerMessage(final Message message) throws MSROException {
23
		log.debug("Received a ONGOING message");
23
		log.debug(String.format("Received %s message", message.getMessageType()));
24 24

  
25 25
		if (Objects.isNull(message.getMessageType())) {
26 26
			throw new MSROException("missing message type in: " + message.toString());
modules/dnet-openaireplus-workflows/trunk/src/main/java/eu/dnetlib/msro/openaireplus/workflows/nodes/dhp/SubmitDnetHadoopJobNode.java
1 1
package eu.dnetlib.msro.openaireplus.workflows.nodes.dhp;
2 2

  
3
import eu.dnetlib.msro.rmi.MSROException;
4 3
import eu.dnetlib.msro.rmi.MSRORuntimeException;
5 4
import org.apache.commons.logging.Log;
6 5
import org.apache.commons.logging.LogFactory;
......
18 17
import eu.dnetlib.msro.workflows.util.ProgressProvider;
19 18

  
20 19
import java.util.Objects;
21
import java.util.Optional;
22 20

  
23 21
public class SubmitDnetHadoopJobNode extends SubmitHadoopJobNode implements ProgressProvider, ProgressJobNode {
24 22

  
......
80 78
				final Message report = dnetMessageManager.findReportMessage(wfId);
81 79

  
82 80
				if (Objects.isNull(report)) {
83
					final String msg = "cannot find report for workflow id: " + wfId;
84
					log.error(msg);
85
					throw new MSRORuntimeException(msg);
81
					log.error("cannot find report for workflow id: " + wfId);
82
				} else {
83
					report.getBody().forEach((k, v) -> log.info(String.format("%s - %s", k, v)));
84
					job.getParameters().putAll(report.getBody());
86 85
				}
87
				report.getBody().forEach((k, v) -> log.info(String.format("%s - %s", k, v)));
88
				job.getParameters().putAll(report.getBody());
89 86
				return job;
90 87
			}
91 88

  

Also available in: Unified diff