Back out changes for Change I7f782ead: IPL service not returning error on invalid isteps

Not handling sync points correctly; skipping load_payload and cxxtest.
Back out until I can thoroughly test the fix.

Change-Id: Idcb92fbce50757726cd5d624c6081e525709f43b
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2315
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 13 insertions, 1 deletions

diff --git a/src/usr/initservice/istepdispatcher/istepWorker.C b/src/usr/initservice/istepdispatcher/istepWorker.C
index 09074a8ae..85970047b 100644
--- a/src/usr/initservice/istepdispatcher/istepWorker.C
+++ b/src/usr/initservice/istepdispatcher/istepWorker.C
@@ -166,7 +166,13 @@ void iStepWorkerThread ( void * i_msgQ )
         }
         else
         {
-
+#if 1
+            //  Nothing to do for this istep.
+            TRACFCOMP( g_trac_initsvc,
+                       INFO_MRK"Empty Istep, Nothing to do!" );
+#else
+            //  $$  please save, need to fix for
+            //  $$      IPL service not returning error on invalid isteps
             //  This istep should have not been sent here to run, make up
             //  an errorlog and return it.
             /*@
@@ -189,6 +195,7 @@ void iStepWorkerThread ( void * i_msgQ )
                        istep,
                        substep,
                        err->plid()  );
+#endif
         }
 
         //  flush contTrace after each istep/substep  returns
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index 7e8352714..f22eb1db6 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -248,6 +248,10 @@ errlHndl_t IStepDispatcher::executeAllISteps ( void )
                  substep < (g_isteps[istep].numitems + 1);
                  substep++ )
             {
+#if 1
+                //  $$  please save, need to fix for
+                //  $$      IPL service not returning error on invalid isteps
+#else
                 //  If the istep/substep doesn't exist, skip it.
                 if ( findTaskInfo( istep, substep ) ==  NULL )
                 {
@@ -257,6 +261,7 @@ errlHndl_t IStepDispatcher::executeAllISteps ( void )
                                substep  );
                     continue;
                 }
+#endif
                 // Before we can do anything, we need to be sure the worker thread is
                 // ready to start
                 theMsg = msg_wait( iv_msgQ );