Fix propagation of earlier exception in Transformer

cms-sw · Feb 24, 2023 · 3f397f0 · 3f397f0
1 parent 80b0d70
commit 3f397f0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/FWCore/Framework/src/ProductResolvers.cc b/FWCore/Framework/src/ProductResolvers.cc
@@ -516,6 +516,17 @@ namespace edm {
     return Resolution(nullptr);
   }
 
+  void TransformingProductResolver::putProduct(std::unique_ptr<WrapperBase> edp) const {
+    // Override putProduct() to not set the resolver status to
+    // ResolveFailed when the Event::commit_() checks which produced
+    // products were actually produced and which not, because the
+    // transforming products are never produced by time of commit_()
+    // by construction.
+    if (edp) {
+      ProducedProductResolver::putProduct(std::move(edp));
+    }
+  }
+
   void TransformingProductResolver::prefetchAsync_(WaitingTaskHolder waitTask,
                                                    Principal const& principal,
                                                    bool skipCurrentProcess,

diff --git a/FWCore/Framework/src/ProductResolvers.h b/FWCore/Framework/src/ProductResolvers.h
@@ -257,11 +257,12 @@ namespace edm {
   class TransformingProductResolver : public ProducedProductResolver {
   public:
     explicit TransformingProductResolver(std::shared_ptr<BranchDescription const> bd)
-        : ProducedProductResolver(bd, ProductStatus::ResolveFailed), mcc_(nullptr) {}
+        : ProducedProductResolver(bd, ProductStatus::ResolveNotRun), mcc_(nullptr) {}
 
     void setupUnscheduled(UnscheduledConfigurator const&) final;
 
   private:
+    void putProduct(std::unique_ptr<WrapperBase> edp) const override;
     Resolution resolveProduct_(Principal const& principal,
                                bool skipCurrentProcess,
                                SharedResourcesAcquirer* sra,

diff --git a/FWCore/Integration/test/transformTest_cfg.py b/FWCore/Integration/test/transformTest_cfg.py
@@ -14,7 +14,6 @@
 parser.add_argument("--addTracer", help="add Tracer service", action="store_true")
 parser.add_argument("--async_", help="use asynchronous module", action="store_true")
 parser.add_argument("--exception", help="Make module consumed by transformer to throw an exception", action="store_true")
-parser.add_argument("--outputFile", help="File to save job output", default=None, type=str)
 
 argv = sys.argv[:]
 if '--' in argv:
@@ -23,10 +22,6 @@
 
 
 process = cms.Process("TEST")
-if args.outputFile is not None:
-    process.MessageLogger.cerr.enable = False
-    process.MessageLogger.files.outputFile = dict(filename=args.outputFile,
-                                                  noTimeStamps= True)
 
 process.source = cms.Source("EmptySource")