@@ -67,12 +67,8 @@ impl PreComputeArgs {
6767 TeeSessionEnvironmentVariable :: IexecPreComputeOut ,
6868 ReplicateStatusCause :: PreComputeOutputPathMissing ,
6969 ) {
70- Ok ( output_dir) => {
71- info ! ( "Successfully read output directory: {output_dir}" ) ;
72- output_dir
73- }
70+ Ok ( output_dir) => output_dir,
7471 Err ( e) => {
75- error ! ( "Failed to read output directory: {e:?}" ) ;
7672 return ( PreComputeArgs :: default ( ) , vec ! [ e] ) ;
7773 }
7874 } ;
@@ -82,18 +78,13 @@ impl PreComputeArgs {
8278 ReplicateStatusCause :: PreComputeIsDatasetRequiredMissing ,
8379 ) {
8480 Ok ( s) => match s. to_lowercase ( ) . parse :: < bool > ( ) {
85- Ok ( value) => {
86- info ! ( "Dataset required: {value}" ) ;
87- value
88- }
81+ Ok ( value) => value,
8982 Err ( _) => {
90- error ! ( "Invalid boolean format for IS_DATASET_REQUIRED: {s}" ) ;
9183 exit_causes. push ( ReplicateStatusCause :: PreComputeIsDatasetRequiredMissing ) ;
9284 false
9385 }
9486 } ,
9587 Err ( e) => {
96- error ! ( "Failed to read IS_DATASET_REQUIRED: {e:?}" ) ;
9788 exit_causes. push ( e) ;
9889 false
9990 }
@@ -104,18 +95,13 @@ impl PreComputeArgs {
10495 ReplicateStatusCause :: PreComputeFailedUnknownIssue ,
10596 ) {
10697 Ok ( s) => match s. parse :: < usize > ( ) {
107- Ok ( value) => {
108- info ! ( "Bulk slice size: {value}" ) ;
109- value
110- }
98+ Ok ( value) => value,
11199 Err ( _) => {
112- error ! ( "Invalid numeric format for IEXEC_BULK_SLICE_SIZE: {s}" ) ;
113100 exit_causes. push ( ReplicateStatusCause :: PreComputeFailedUnknownIssue ) ;
114101 0
115102 }
116103 } ,
117104 Err ( e) => {
118- error ! ( "Failed to read IEXEC_BULK_SLICE_SIZE: {e:?}" ) ;
119105 exit_causes. push ( e) ;
120106 0
121107 }
@@ -125,23 +111,13 @@ impl PreComputeArgs {
125111
126112 // Read datasets
127113 let start_index = if is_dataset_required { 0 } else { 1 } ;
128- info ! (
129- "Reading datasets from index {start_index} to {iexec_bulk_slice_size} (is_dataset_required: {is_dataset_required})"
130- ) ;
131-
132114 for i in start_index..=iexec_bulk_slice_size {
133- info ! ( "Processing dataset at index {i}" ) ;
134-
135115 let filename = match get_env_var_or_error (
136116 TeeSessionEnvironmentVariable :: IexecDatasetFilename ( i) ,
137117 ReplicateStatusCause :: PreComputeDatasetFilenameMissing ( format ! ( "dataset_{i}" ) ) ,
138118 ) {
139- Ok ( filename) => {
140- info ! ( "Dataset {i} filename: {filename}" ) ;
141- filename
142- }
119+ Ok ( filename) => filename,
143120 Err ( e) => {
144- error ! ( "Failed to read dataset {i} filename: {e:?}" ) ;
145121 exit_causes. push ( e) ;
146122 continue ;
147123 }
@@ -151,12 +127,8 @@ impl PreComputeArgs {
151127 TeeSessionEnvironmentVariable :: IexecDatasetUrl ( i) ,
152128 ReplicateStatusCause :: PreComputeDatasetUrlMissing ( filename. clone ( ) ) ,
153129 ) {
154- Ok ( url) => {
155- info ! ( "Dataset {i} URL: {url}" ) ;
156- url
157- }
130+ Ok ( url) => url,
158131 Err ( e) => {
159- error ! ( "Failed to read dataset {i} URL: {e:?}" ) ;
160132 exit_causes. push ( e) ;
161133 continue ;
162134 }
@@ -166,12 +138,8 @@ impl PreComputeArgs {
166138 TeeSessionEnvironmentVariable :: IexecDatasetChecksum ( i) ,
167139 ReplicateStatusCause :: PreComputeDatasetChecksumMissing ( filename. clone ( ) ) ,
168140 ) {
169- Ok ( checksum) => {
170- info ! ( "Dataset {i} checksum: {checksum}" ) ;
171- checksum
172- }
141+ Ok ( checksum) => checksum,
173142 Err ( e) => {
174- error ! ( "Failed to read dataset {i} checksum: {e:?}" ) ;
175143 exit_causes. push ( e) ;
176144 continue ;
177145 }
@@ -181,66 +149,48 @@ impl PreComputeArgs {
181149 TeeSessionEnvironmentVariable :: IexecDatasetKey ( i) ,
182150 ReplicateStatusCause :: PreComputeDatasetKeyMissing ( filename. clone ( ) ) ,
183151 ) {
184- Ok ( key) => {
185- info ! ( "Dataset {i} key successfully read" ) ;
186- key
187- }
152+ Ok ( key) => key,
188153 Err ( e) => {
189- error ! ( "Failed to read dataset {i} key: {e:?}" ) ;
190154 exit_causes. push ( e) ;
191155 continue ;
192156 }
193157 } ;
194158
195- info ! ( "Successfully loaded dataset {i} ({filename})" ) ;
196159 datasets. push ( Dataset :: new ( url, checksum, filename, key) ) ;
197160 }
198161
199- info ! ( "Successfully loaded {} datasets" , datasets. len( ) ) ;
200-
201162 let input_files_nb = match get_env_var_or_error (
202163 TeeSessionEnvironmentVariable :: IexecInputFilesNumber ,
203164 ReplicateStatusCause :: PreComputeInputFilesNumberMissing ,
204165 ) {
205166 Ok ( s) => match s. parse :: < usize > ( ) {
206- Ok ( value) => {
207- info ! ( "Number of input files: {value}" ) ;
208- value
209- }
167+ Ok ( value) => value,
210168 Err ( _) => {
211- error ! ( "Invalid numeric format for IEXEC_INPUT_FILES_NUMBER: {s}" ) ;
212169 exit_causes. push ( ReplicateStatusCause :: PreComputeInputFilesNumberMissing ) ;
213170 0
214171 }
215172 } ,
216173 Err ( e) => {
217- error ! ( "Failed to read IEXEC_INPUT_FILES_NUMBER: {e:?}" ) ;
218174 exit_causes. push ( e) ;
219175 0
220176 }
221177 } ;
222178
223- info ! ( "Reading {input_files_nb} input file URLs" ) ;
224179 let input_files: Vec < String > = ( 1 ..=input_files_nb)
225180 . filter_map ( |i| {
226- get_env_var_or_error (
181+ match get_env_var_or_error (
227182 TeeSessionEnvironmentVariable :: IexecInputFileUrlPrefix ( i) ,
228183 ReplicateStatusCause :: PreComputeAtLeastOneInputFileUrlMissing ( i) ,
229- )
230- . map_err ( |e| {
231- error ! ( "Failed to read input file {i} URL: {e:?}" ) ;
232- exit_causes. push ( e)
233- } )
234- . ok ( )
235- . map ( |url| {
236- info ! ( "Input file {i} URL: {url}" ) ;
237- url
238- } )
184+ ) {
185+ Ok ( url) => Some ( url) ,
186+ Err ( e) => {
187+ exit_causes. push ( e) ;
188+ None
189+ }
190+ }
239191 } )
240192 . collect ( ) ;
241193
242- info ! ( "Successfully loaded {} input files" , input_files. len( ) ) ;
243-
244194 if !exit_causes. is_empty ( ) {
245195 error ! (
246196 "Encountered {} error(s) while reading pre-compute arguments" ,
0 commit comments