Try to kill OnDemand Race

Author: eisenhauer

source/adios2/toolkit/sst/cp/cp_internal.h

@@ -198,6 +198,7 @@ struct _SstStream
     char *AbsoluteFilename;
     int GlobalOpRequired;
     StepRequest StepRequestQueue;
+    int CloseMessagesSent;
 
     /* writer side marshal info */
     void *WriterMarshalData;

source/adios2/toolkit/sst/cp/cp_writer.c

@@ -1486,6 +1486,7 @@ static void SendCloseMsgs(SstStream Stream)
 
     sendOneToEachReaderRank(Stream, Stream->CPInfo->SharedCM->WriterCloseFormat, &Msg,
                             &Msg.RS_Stream);
+    Stream->CloseMessagesSent = 1;
 }
 
 /*
@@ -2581,6 +2582,11 @@ void CP_ReaderRequestStepHandler(CManager cm, CMConnection conn, void *Msg_v, vo
 
     CP_verbose(Stream, TraceVerbose, "In RequestStepHandler, queueing request\n");
     assert(RequestingReader != -1);
+    if (Stream->CloseMessagesSent)
+    {
+        CP_verbose(Stream, TraceVerbose, "In RequestStepHandler, stream closing, ignore\n");
+        STREAM_MUTEX_UNLOCK(CP_WSR_Stream->ParentStream);
+    }
     StepRequest Request = calloc(sizeof(*Request), 1);
     Request->RequestingReader = RequestingReader;
     if (!Stream->StepRequestQueue)