Index: /tags/ipp-20150329/ippTasks/ipphosts.mhpcc.config =================================================================== --- /tags/ipp-20150329/ippTasks/ipphosts.mhpcc.config (revision 38119) +++ /tags/ipp-20150329/ippTasks/ipphosts.mhpcc.config (revision 38120) @@ -17,74 +17,74 @@ # ipp045 : reference cat ## -## now focus on new storage nodes only and not stsci since not ps1sc products 12/18/14 -- v2/05/15 +## now focus on new storage nodes only and not stsci since not ps1sc products 12/18/14 -- 04/07/15 ## -- lower use of full nodes 67--81, even though transient diffs are large, but still need some since warp+dif ## -- try to avoid all the random alloc from no bbu nodes still +## -- ipp097 try adding now ipphosts METADATA camera STR skycell count S32 60 - sky00 STR ipp095.0 + sky00 STR ipp097.0 sky01 STR ipp095.0 - sky02 STR ipp093.0 - sky03 STR ipp092.0 - sky04 STR ipp091.0 - sky05 STR ipp090.0 - sky06 STR ipp089.0 - sky07 STR ipp088.0 - sky08 STR ipp087.0 + sky02 STR ipp094.0 + sky03 STR ipp093.0 + sky04 STR ipp092.0 + sky05 STR ipp091.0 + sky06 STR ipp090.0 + sky07 STR ipp089.0 + sky08 STR ipp088.0 sky09 STR ipp087.0 - sky10 STR ipp085.0 - sky11 STR ipp084.0 - sky12 STR ipp083.0 - sky13 STR ipp082.0 - - sky14 STR ipp081.0 - sky15 STR ipp080.0 - sky16 STR ipp079.0 - sky17 STR ipp078.0 - sky18 STR ipp077.0 - sky19 STR ipp076.0 - sky20 STR ipp075.0 - sky21 STR ipp074.0 - sky22 STR ipp073.0 - sky23 STR ipp072.0 - sky24 STR ipp071.0 - sky25 STR ipp070.0 - sky26 STR ipp069.0 - sky27 STR ipp068.0 - sky28 STR ipp067.0 - - sky29 STR ipp095.0 - sky30 STR ipp093.0 - sky31 STR ipp093.0 - sky32 STR ipp092.0 - sky33 STR ipp091.0 - sky34 STR ipp090.0 - sky35 STR ipp089.0 - sky36 STR ipp088.0 - sky37 STR ipp087.0 - sky38 STR ipp085.0 - sky39 STR ipp085.0 - sky40 STR ipp084.0 - sky41 STR ipp083.0 - sky42 STR ipp082.0 - - sky43 STR ipp081.0 - sky44 STR ipp080.0 - sky45 STR ipp079.0 - sky46 STR ipp078.0 - sky47 STR ipp077.0 - sky48 STR ipp076.0 - sky49 STR ipp075.0 - sky50 STR ipp074.0 - sky51 STR ipp073.0 - sky52 STR ipp072.0 - sky53 STR ipp071.0 - sky54 STR ipp070.0 - sky55 STR ipp069.0 - sky56 STR ipp068.0 - sky57 STR ipp067.0 - - sky58 STR ipp091.0 - sky59 STR ipp090.0 + sky10 STR ipp086.0 + sky11 STR ipp085.0 + sky12 STR ipp084.0 + sky13 STR ipp083.0 + sky14 STR ipp082.0 + + sky15 STR ipp081.0 + sky16 STR ipp080.0 + sky17 STR ipp079.0 + sky18 STR ipp078.0 + sky19 STR ipp077.0 + sky20 STR ipp076.0 + sky21 STR ipp075.0 + sky22 STR ipp074.0 + sky23 STR ipp073.0 + sky24 STR ipp072.0 + sky25 STR ipp071.0 + sky26 STR ipp070.0 + sky27 STR ipp069.0 + sky28 STR ipp068.0 + sky29 STR ipp077.0 + + sky30 STR ipp097.0 + sky31 STR ipp095.0 + sky32 STR ipp094.0 + sky33 STR ipp093.0 + sky34 STR ipp092.0 + sky35 STR ipp091.0 + sky36 STR ipp090.0 + sky37 STR ipp089.0 + sky38 STR ipp088.0 + sky39 STR ipp087.0 + sky40 STR ipp086.0 + sky41 STR ipp085.0 + sky42 STR ipp084.0 + sky43 STR ipp083.0 + sky44 STR ipp082.0 + + sky45 STR ipp081.0 + sky46 STR ipp080.0 + sky47 STR ipp079.0 + sky48 STR ipp078.0 + sky49 STR ipp077.0 + sky50 STR ipp076.0 + sky51 STR ipp075.0 + sky52 STR ipp074.0 + sky53 STR ipp073.0 + sky54 STR ipp072.0 + sky55 STR ipp071.0 + sky56 STR ipp070.0 + sky57 STR ipp069.0 + sky58 STR ipp068.0 + sky59 STR ipp067.0 END @@ -92,69 +92,67 @@ ## now focus on new storage nodes only 12/18/14 ## -- chips transient and smaller so 67-81 ok -## -- double up some to replace problem/down nodes 094,086 ipphosts METADATA camera STR GPC1 - XY01 STR ipp095 - XY02 STR ipp089 - XY03 STR ipp093 - XY04 STR ipp092 - XY05 STR ipp091 - XY06 STR ipp090 - XY10 STR ipp089 - XY11 STR ipp088 - XY12 STR ipp087 - XY13 STR ipp088 - XY14 STR ipp085 - XY15 STR ipp084 - XY16 STR ipp083 - XY17 STR ipp082 - XY20 STR ipp081 - XY21 STR ipp080 - XY22 STR ipp079 - XY23 STR ipp078 - XY24 STR ipp077 - XY25 STR ipp076 - XY26 STR ipp075 - XY27 STR ipp074 - XY30 STR ipp073 - XY31 STR ipp072 - XY32 STR ipp071 - XY33 STR ipp070 - XY34 STR ipp069 - XY35 STR ipp068 - XY36 STR ipp067 - - XY37 STR ipp095 - XY40 STR ipp084 - XY41 STR ipp093 - XY42 STR ipp092 - XY43 STR ipp091 - XY44 STR ipp090 - XY45 STR ipp089 - XY46 STR ipp088 - XY47 STR ipp087 - XY50 STR ipp083 - XY51 STR ipp085 - XY52 STR ipp084 - XY53 STR ipp083 - XY54 STR ipp082 - XY55 STR ipp081 - XY56 STR ipp080 - XY57 STR ipp079 - XY60 STR ipp078 - XY61 STR ipp077 - XY62 STR ipp076 - XY63 STR ipp075 - XY64 STR ipp074 - XY65 STR ipp073 - XY66 STR ipp072 - XY67 STR ipp071 - XY71 STR ipp070 - XY72 STR ipp069 - XY73 STR ipp068 - XY74 STR ipp067 - - XY75 STR ipp077 - XY76 STR ipp082 + XY01 STR ipp097 + XY02 STR ipp095 + XY03 STR ipp094 + XY04 STR ipp093 + XY05 STR ipp092 + XY06 STR ipp091 + XY10 STR ipp090 + XY11 STR ipp089 + XY12 STR ipp088 + XY13 STR ipp087 + XY14 STR ipp086 + XY15 STR ipp085 + XY16 STR ipp084 + XY17 STR ipp083 + XY20 STR ipp082 + XY21 STR ipp081 + XY22 STR ipp080 + XY23 STR ipp079 + XY24 STR ipp078 + XY25 STR ipp077 + XY26 STR ipp076 + XY27 STR ipp075 + XY30 STR ipp074 + XY31 STR ipp073 + XY32 STR ipp072 + XY33 STR ipp071 + XY34 STR ipp070 + XY35 STR ipp069 + XY36 STR ipp068 + XY37 STR ipp067 + + XY40 STR ipp097 + XY41 STR ipp095 + XY42 STR ipp094 + XY43 STR ipp093 + XY44 STR ipp092 + XY45 STR ipp091 + XY46 STR ipp090 + XY47 STR ipp089 + XY50 STR ipp088 + XY51 STR ipp087 + XY52 STR ipp086 + XY53 STR ipp085 + XY54 STR ipp084 + XY55 STR ipp083 + XY56 STR ipp082 + XY57 STR ipp081 + XY60 STR ipp080 + XY61 STR ipp079 + XY62 STR ipp078 + XY63 STR ipp077 + XY64 STR ipp076 + XY65 STR ipp075 + XY66 STR ipp074 + XY67 STR ipp073 + XY71 STR ipp072 + XY72 STR ipp071 + XY73 STR ipp070 + XY74 STR ipp069 + XY75 STR ipp068 + XY76 STR ipp067 END @@ -162,72 +160,69 @@ ## -- 066 and lower w/bbu just raw ota products or randomly if repair, only 1G so limit. ## -- avoid 67-81 for permanent raw products since nearly full and need buffer for large diffims -## -- 092 lot of free space so try double up there for when bbu fixed -- try 2/3/2015 -## -- try newer data nodes w/ poor BBU w/ just raw OTA since <066 seems to work ok ipphosts METADATA camera STR gpc1 - ota01 STR ipp095 - ota02 STR ipp094 - ota03 STR ipp093 - ota04 STR ipp092 - ota05 STR ipp091 - ota06 STR ipp090 - ota10 STR ipp089 - ota11 STR ipp088 - ota12 STR ipp087 - ota13 STR ipp086 - ota14 STR ipp085 - ota15 STR ipp084 - ota16 STR ipp083 - ota17 STR ipp082 - - ota20 STR ipp095 - ota21 STR ipp094 - ota22 STR ipp093 - ota23 STR ipp092 - ota24 STR ipp091 - ota25 STR ipp090 - ota26 STR ipp089 - ota27 STR ipp087 - ota30 STR ipp086 - ota31 STR ipp085 - ota32 STR ipp084 - ota33 STR ipp083 - ota34 STR ipp082 - - ota35 STR ipp095 - ota36 STR ipp094 - ota37 STR ipp093 - ota40 STR ipp092 - ota41 STR ipp091 - ota42 STR ipp090 - ota43 STR ipp089 - ota44 STR ipp088 - ota45 STR ipp087 - ota46 STR ipp086 - ota47 STR ipp085 - ota50 STR ipp084 - ota51 STR ipp083 - ota52 STR ipp082 - - ota53 STR ipp095 - ota54 STR ipp066 - ota55 STR ipp093 - ota56 STR ipp092 - ota57 STR ipp091 - ota60 STR ipp090 - ota61 STR ipp089 - ota62 STR ipp088 - ota63 STR ipp087 - ota64 STR ipp063 - ota65 STR ipp085 - ota66 STR ipp084 - ota67 STR ipp083 - ota71 STR ipp082 - - ota72 STR ipp056 - ota73 STR ipp056 - ota74 STR ipp058 - ota75 STR ipp058 - ota76 STR ipp092 + ota01 STR ipp097 + ota02 STR ipp095 + ota03 STR ipp094 + ota04 STR ipp093 + ota05 STR ipp092 + ota06 STR ipp091 + ota10 STR ipp090 + ota11 STR ipp089 + ota12 STR ipp088 + ota13 STR ipp087 + ota14 STR ipp086 + ota15 STR ipp085 + ota16 STR ipp084 + ota17 STR ipp083 + ota20 STR ipp082 + + ota21 STR ipp097 + ota22 STR ipp095 + ota23 STR ipp094 + ota24 STR ipp093 + ota25 STR ipp092 + ota26 STR ipp091 + ota27 STR ipp090 + ota30 STR ipp089 + ota31 STR ipp088 + ota32 STR ipp087 + ota33 STR ipp086 + ota34 STR ipp085 + ota35 STR ipp084 + ota36 STR ipp083 + ota37 STR ipp082 + + ota40 STR ipp097 + ota41 STR ipp095 + ota42 STR ipp094 + ota43 STR ipp093 + ota44 STR ipp092 + ota45 STR ipp091 + ota46 STR ipp090 + ota47 STR ipp089 + ota50 STR ipp088 + ota51 STR ipp087 + ota52 STR ipp086 + ota53 STR ipp085 + ota54 STR ipp084 + ota55 STR ipp083 + ota56 STR ipp082 + + ota57 STR ipp097 + ota60 STR ipp095 + ota61 STR ipp094 + ota62 STR ipp093 + ota63 STR ipp092 + ota64 STR ipp091 + ota65 STR ipp090 + ota66 STR ipp089 + ota67 STR ipp088 + ota71 STR ipp087 + ota72 STR ipp086 + ota73 STR ipp085 + ota74 STR ipp084 + ota75 STR ipp083 + ota76 STR ipp082 END Index: /tags/ipp-20150329/ippTasks/lap.pro =================================================================== --- /tags/ipp-20150329/ippTasks/lap.pro (revision 38119) +++ /tags/ipp-20150329/ippTasks/lap.pro (revision 38120) @@ -220,5 +220,5 @@ periods -poll $LOADPOLL periods -exec $LOADEXEC - periods -timeout 600 + periods -timeout 3600 active false # This can probably be increased and spread over hosts in the future. @@ -341,8 +341,8 @@ periods -poll $LOADPOLL periods -exec $LOADEXEC - periods -timeout 600 + periods -timeout 3600 active false # This can probably be increased and spread over hosts in the future. - npending 1 + npending 4 task.exec @@ -461,5 +461,5 @@ periods -poll $LOADPOLL periods -exec $LOADEXEC - periods -timeout 600 + periods -timeout 3600 active false # This can probably be increased and spread over hosts in the future. Index: /tags/ipp-20150329/ippTasks/remote.pro =================================================================== --- /tags/ipp-20150329/ippTasks/remote.pro (revision 38119) +++ /tags/ipp-20150329/ippTasks/remote.pro (revision 38120) @@ -27,4 +27,5 @@ stack staticsky + diff end @@ -293,5 +294,8 @@ end if ("$STAGE" == "staticsky") - $command = sc_prepare_staticsky.pl --camera GPC1 --sky_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot -dbname $DBNAME + $command = sc_prepare_staticsky.pl --camera GPC1 --sky_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME + end + if ("$STAGE" == "diff") + $command = sc_prepare_diff.pl --camera GPC1 --diff_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME end Index: /tags/ipp-20150329/ippTools/share/Makefile.am =================================================================== --- /tags/ipp-20150329/ippTools/share/Makefile.am (revision 38119) +++ /tags/ipp-20150329/ippTools/share/Makefile.am (revision 38120) @@ -525,4 +525,5 @@ remotetool_definebyquery_stack.sql \ remotetool_definebyquery_staticsky.sql \ + remotetool_definebyquery_diff.sql \ remotetool_dropcomponent.sql \ remotetool_listcomponent.sql \ Index: /tags/ipp-20150329/ippTools/share/remotetool_definebyquery_diff.sql =================================================================== --- /tags/ipp-20150329/ippTools/share/remotetool_definebyquery_diff.sql (revision 38120) +++ /tags/ipp-20150329/ippTools/share/remotetool_definebyquery_diff.sql (revision 38120) @@ -0,0 +1,21 @@ +SELECT stage_id FROM + +( SELECT diff_id AS stage_id + FROM diffRun +WHERE +diffRun.state = 'new' +-- where hook %s +GROUP BY diff_id +) AS W + +LEFT JOIN + +(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state + FROM remoteRun + JOIN remoteComponent USING(remote_id) +WHERE +remoteRun.stage = 'staticsky' AND remoteComponent.state != 'retry' +-- where hook %s +) AS R +USING(stage_id) +WHERE R.remote_id IS NULL Index: /tags/ipp-20150329/ippTools/src/pxspace.c =================================================================== --- /tags/ipp-20150329/ippTools/src/pxspace.c (revision 38119) +++ /tags/ipp-20150329/ippTools/src/pxspace.c (revision 38120) @@ -59,22 +59,22 @@ bool pxspaceBoxAddWhere(pxConfig *config, psMetadata *where) { - PXOPT_LOOKUP_F64(ra_min, config->args, "-ra_min", false, false); - PXOPT_LOOKUP_F64(ra_max, config->args, "-ra_max", false, false); - PXOPT_LOOKUP_F64(dec_min, config->args, "-dec_min", false, false); - PXOPT_LOOKUP_F64(dec_max, config->args, "-dec_max", false, false); + PXOPT_LOOKUP_F64(ra_min, config->args, "-ra_min", false, NAN); + PXOPT_LOOKUP_F64(ra_max, config->args, "-ra_max", false, NAN); + PXOPT_LOOKUP_F64(dec_min, config->args, "-dec_min", false, NAN); + PXOPT_LOOKUP_F64(dec_max, config->args, "-dec_max", false, NAN); - if (ra_min) { + if (isfinite(ra_min)) { ra_min *= PS_RAD_DEG; psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, ">=", ra_min); } - if (ra_max) { + if (isfinite(ra_max)) { ra_max *= PS_RAD_DEG; psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, "<=", ra_max); } - if (dec_min) { + if (isfinite(dec_min)) { dec_min *= PS_RAD_DEG; psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, ">=", dec_min); } - if (dec_max) { + if (isfinite(dec_max)) { dec_max *= PS_RAD_DEG; psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, "<=", dec_max); Index: /tags/ipp-20150329/ippTools/src/remotetool.c =================================================================== --- /tags/ipp-20150329/ippTools/src/remotetool.c (revision 38119) +++ /tags/ipp-20150329/ippTools/src/remotetool.c (revision 38120) @@ -155,4 +155,15 @@ else if (!strcmp(stage,"staticsky")) { query = pxDataGet("remotetool_definebyquery_staticsky.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS,false, "failed to retreive SQL statement"); + return(false); + } + + if (label) { + psStringAppend(&whereOption, "\n AND (label = '%s')", label); + } + } + else if (!strcmp(stage,"diff")) { + query = pxDataGet("remotetool_definebyquery_diff.sql"); if (!query) { psError(PXTOOLS_ERR_SYS,false, "failed to retreive SQL statement");