Skip to content

Commit f964e9a

Browse files
Merge pull request #322 from iExecBlockchainComputing/feature/no-retry-create-session
Don't retry createTeeSession for now, to avoid polluting logs in SMS …
2 parents 389a24a + 635ac62 commit f964e9a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/main/java/com/iexec/worker/sms/SmsService.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,19 @@ public void saveSecrets(String chainTaskId,
9999
}
100100
}
101101

102-
@Retryable(value = FeignException.class)
102+
/*
103+
* Don't retry createTeeSession for now, to avoid polluting logs in SMS & CAS
104+
* */
105+
//@Retryable(value = FeignException.class)
103106
public String createTeeSession(WorkerpoolAuthorization workerpoolAuthorization) {
104107
String authorization = getAuthorizationString(workerpoolAuthorization);
105108
ResponseEntity<String> response = smsClient.createTeeSession(authorization, workerpoolAuthorization);
109+
log.info("Response of createTeeSession [chainTaskId:{}, httpStatus:{}, httpBody:{}]",
110+
workerpoolAuthorization.getChainTaskId(), response.getStatusCode(), response.getBody());
106111
return response.getStatusCode().is2xxSuccessful() ? response.getBody() : "";
107112
}
108113

109-
@Recover
114+
//@Recover
110115
private String createTeeSession(FeignException e, WorkerpoolAuthorization workerpoolAuthorization) {
111116
log.error("Failed to create secure session [chainTaskId:{}, httpStatus:{}, exception:{}, attempts:3]",
112117
workerpoolAuthorization.getChainTaskId(), e.status(), e.getMessage());

src/main/resources/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ wallet:
2121

2222
scone:
2323
las:
24-
image: ${IEXEC_LAS_IMAGE:nexus.iex.ec/iexec-las}
25-
version: ${IEXEC_LAS_VERSION:sdk2.5}
24+
image: ${IEXEC_LAS_IMAGE:iexechub/sconecuratedimages-iexec}
25+
version: ${IEXEC_LAS_VERSION:las-v3.0}
2626
port: ${IEXEC_LAS_PORT:18766}
2727

2828
decryptFilePath: ${IEXEC_DECRYPT_FILE_PATH:./src/main/resources/decrypt-dataset.sh}

0 commit comments

Comments
 (0)