Changeset 548


Ignore:
Timestamp:
02/09/12 19:04:14 (12 years ago)
Author:
sdipsl
Message:

Bugfix : when retrieving input ifiles from another filesystem than /dmnfs you must not use dmget ... it hangs forever ...

Location:
trunk/libIGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

    r545 r548  
    299299            eval file_out_=\${${ListFilesName}[$i_]} > /dev/null 2>&1 
    300300            eval file_out=${file_out_} 
    301              
    302             IGCM_sys_Get ${file_in} ${file_out} 
    303             #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out} 
    304  
     301 
     302            IGCM_sys_IsFileArchived ${file_in} 
     303            if [ ! $? = 0 ] ; then 
     304              IGCM_sys_Get ${file_in} ${file_out} 
     305              #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out} 
     306            else 
     307              IGCM_sys_Cp ${file_in} ${file_out} 
     308            fi 
    305309            (( i=i+2 )) 
    306310          done 
    … …  
    418422        [ ${SmoothMax} -eq -1 ] && SmoothMax=${CumulPeriod} 
    419423        if ( [ X${ret} = Xtrue ] || ( [ ${Period} -eq 1 ] && [ ${CumulPeriod} -ge ${SmoothMin} ] && [ ${CumulPeriod} -le ${SmoothMax} ] ) ) ; then 
    420           #if ( [ X${ret} = Xtrue ] || [ ${Period} -eq 1 ] ) ; then 
    421           IGCM_sys_Get ${file_in} ${file_out} 
    422           #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out} 
     424 
     425          IGCM_sys_IsFileArchived ${file_in} 
     426          if [ ! $? = 0 ] ; then 
     427            IGCM_sys_Get ${file_in} ${file_out} 
     428            #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out} 
     429          else 
     430            IGCM_sys_Cp ${file_in} ${file_out} 
     431          fi 
    423432        fi 
    424433        (( i=i+3 )) 
    … …  
    498507          eval file_out=${file_out_} 
    499508 
    500           IGCM_sys_Get ${file_in} ${file_out} 
     509          IGCM_sys_IsFileArchived ${file_in} 
     510          if [ $? = 0 ] ; then 
     511            IGCM_sys_Get ${file_in} ${file_out} 
     512            #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out} 
     513          else 
     514            IGCM_sys_Cp ${file_in} ${file_out} 
     515          fi 
    501516 
    502517          if [ X${file_out} != X. ] ; then 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

    r545 r548  
    439439 
    440440#D-#================================================== 
     441#D-function IGCM_sys_IsFileArchived 
     442#D-* Purpose: Test file that must NOT EXISTS on Archive 
     443#D-* Examples: 
     444#D- 
     445function IGCM_sys_IsFileArchived { 
     446  IGCM_debug_PushStack "IGCM_sys_IsFileArchived" $@ 
     447  if ( $DEBUG_sys ) ; then 
     448    echo "IGCM_sys_IsFileArchived :" $@ 
     449  fi 
     450  typeset IsArchivedFlag 
     451  IsArchivedFlag=$( [ X$( echo $1 | grep ^\/dmnfs ) != X ] && echo 0 || echo 1 ) 
     452  IGCM_debug_PopStack "IGCM_sys_IsFileArchived" 
     453 
     454  return ${IsArchivedFlag} 
     455} 
     456 
     457#D-#================================================== 
    441458#D-function IGCM_sys_TestFileArchive 
    442459#D-* Purpose: Test file that must NOT EXISTS on Archive 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

    r545 r548  
    392392 
    393393  return ${ExistFlag} 
     394} 
     395 
     396#D-#================================================== 
     397#D-function IGCM_sys_IsFileArchived 
     398#D-* Purpose: Test file that must NOT EXISTS on Archive 
     399#D-* Examples: 
     400#D- 
     401function IGCM_sys_IsFileArchived { 
     402  IGCM_debug_PushStack "IGCM_sys_IsFileArchived" $@ 
     403  if ( $DEBUG_sys ) ; then 
     404    echo "IGCM_sys_IsFileArchived :" $@ 
     405  fi 
     406  typeset IsArchivedFlag 
     407  IsArchivedFlag=$( [ X$( echo $1 | grep ^\/dmnfs ) != X ] && echo 0 || echo 1 ) 
     408  IGCM_debug_PopStack "IGCM_sys_IsFileArchived" 
     409 
     410  return ${IsArchivedFlag} 
    394411} 
    395412 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex8.ksh

    r545 r548  
    469469 
    470470#D-#================================================== 
     471#D-function IGCM_sys_IsFileArchived 
     472#D-* Purpose: Test file that must NOT EXISTS on Archive 
     473#D-* Examples: 
     474#D- 
     475function IGCM_sys_IsFileArchived { 
     476  IGCM_debug_PushStack "IGCM_sys_IsFileArchived" $@ 
     477  if ( $DEBUG_sys ) ; then 
     478    echo "IGCM_sys_IsFileArchived :" $@ 
     479  fi 
     480  typeset IsArchivedFlag 
     481  IsArchivedFlag=$( [ X$( echo $1 | grep ^\/dmnfs ) != X ] && echo 0 || echo 1 ) 
     482  IGCM_debug_PopStack "IGCM_sys_IsFileArchived" 
     483 
     484  return ${IsArchivedFlag} 
     485} 
     486 
     487#D-#================================================== 
    471488#D-function IGCM_sys_TestFileArchive 
    472489#D-* Purpose: Test file that must NOT EXISTS on Archive 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

    r545 r548  
    453453 
    454454  return ${ExistFlag} 
     455} 
     456 
     457#D-#================================================== 
     458#D-function IGCM_sys_IsFileArchived 
     459#D-* Purpose: Test file that must NOT EXISTS on Archive 
     460#D-* Examples: 
     461#D- 
     462function IGCM_sys_IsFileArchived { 
     463  IGCM_debug_PushStack "IGCM_sys_IsFileArchived" $@ 
     464  if ( $DEBUG_sys ) ; then 
     465    echo "IGCM_sys_IsFileArchived :" $@ 
     466  fi 
     467  typeset IsArchivedFlag 
     468  IsArchivedFlag=$( [ X$( echo $1 | grep ^\/dmnfs ) != X ] && echo 0 || echo 1 ) 
     469  IGCM_debug_PopStack "IGCM_sys_IsFileArchived" 
     470 
     471  return ${IsArchivedFlag} 
    455472} 
    456473 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

    r545 r548  
    516516 
    517517#D-#================================================== 
     518#D-function IGCM_sys_IsFileArchived 
     519#D-* Purpose: Test file that must NOT EXISTS on Archive 
     520#D-* Examples: 
     521#D- 
     522function IGCM_sys_IsFileArchived { 
     523  IGCM_debug_PushStack "IGCM_sys_IsFileArchived" $@ 
     524  if ( $DEBUG_sys ) ; then 
     525    echo "IGCM_sys_IsFileArchived :" $@ 
     526  fi 
     527  typeset IsArchivedFlag 
     528  IsArchivedFlag=$( [ X$( echo $1 | grep ^\/dmnfs ) != X ] && echo 0 || echo 1 ) 
     529  IGCM_debug_PopStack "IGCM_sys_IsFileArchived" 
     530 
     531  return ${IsArchivedFlag} 
     532} 
     533 
     534#D-#================================================== 
    518535#D-function IGCM_sys_TestFileArchive 
    519536#D-* Purpose: Test file that must NOT EXISTS on Archive 
Note: See TracChangeset for help on using the changeset viewer.