mridulm commented on code in PR #2826:
URL: https://github.com/apache/celeborn/pull/2826#discussion_r1809140189
##########
master/src/main/java/org/apache/celeborn/service/deploy/master/MasterSecretRegistryImpl.java:
##########
@@ -44,7 +44,38 @@ public void register(String appId, String secret) {
}
}
- void setMetadataHandler(IMetadataHandler metadataHandler) {
+ @Override
+ public String getSecretKey(String appId) {
+ String secret = super.getSecretKey(appId);
+ if (secret == null && metadataHandler != null) {
+ LOG.info("Fetching secret from metadata manager for appId: {}", appId);
+ ApplicationMeta applicationMeta =
metadataHandler.applicationMetas.get(appId);
+ if (applicationMeta != null) {
+ secret = applicationMeta.secret();
+ LOG.debug("Found Secret from metadata manager for appId: {}, register
secret", appId);
Review Comment:
We could make this an `info` and make the `info` above (for `"Fetching
secret from metadata manager for appId"`) to debug ?
Same for `isRegistered` below
##########
master/src/main/java/org/apache/celeborn/service/deploy/master/MasterSecretRegistryImpl.java:
##########
@@ -44,7 +44,38 @@ public void register(String appId, String secret) {
}
}
- void setMetadataHandler(IMetadataHandler metadataHandler) {
+ @Override
+ public String getSecretKey(String appId) {
+ String secret = super.getSecretKey(appId);
+ if (secret == null && metadataHandler != null) {
+ LOG.info("Fetching secret from metadata manager for appId: {}", appId);
+ ApplicationMeta applicationMeta =
metadataHandler.applicationMetas.get(appId);
+ if (applicationMeta != null) {
+ secret = applicationMeta.secret();
+ LOG.debug("Found Secret from metadata manager for appId: {}, register
secret", appId);
+ super.register(appId, secret);
+ } else {
+ LOG.warn("Secret not found from metadata manager for appId: {}",
appId);
Review Comment:
We dont need to warn for this here - the caller takes care of it already
##########
master/src/main/java/org/apache/celeborn/service/deploy/master/MasterSecretRegistryImpl.java:
##########
@@ -44,7 +44,38 @@ public void register(String appId, String secret) {
}
}
- void setMetadataHandler(IMetadataHandler metadataHandler) {
+ @Override
+ public String getSecretKey(String appId) {
+ String secret = super.getSecretKey(appId);
+ if (secret == null && metadataHandler != null) {
+ LOG.info("Fetching secret from metadata manager for appId: {}", appId);
+ ApplicationMeta applicationMeta =
metadataHandler.applicationMetas.get(appId);
+ if (applicationMeta != null) {
+ secret = applicationMeta.secret();
+ LOG.debug("Found Secret from metadata manager for appId: {}, register
secret", appId);
+ super.register(appId, secret);
+ } else {
+ LOG.warn("Secret not found from metadata manager for appId: {}",
appId);
+ }
+ }
+ return secret;
+ }
+
+ @Override
+ public boolean isRegistered(String appId) {
+ boolean isRegistered = super.isRegistered(appId);
+ if (!isRegistered && metadataHandler != null) {
+ LOG.info("Fetching registration status from metadata manager for appId:
{}", appId);
+ isRegistered = metadataHandler.applicationMetas.containsKey(appId);
+ if (isRegistered) {
+ LOG.debug("Found Secret from metadata manager for appId: {}, register
secret", appId);
+ super.register(appId,
metadataHandler.applicationMetas.get(appId).secret());
+ }
+ }
Review Comment:
```suggestion
final ApplicationMeta current =
metadataHandler.applicationMetas.get(appId);
isRegistered = null != current;
if (isRegistered) {
LOG.info("Found Secret from metadata manager for appId: {}, register
secret", appId);
super.register(appId, current.secret());
}
}
```
##########
master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala:
##########
@@ -1036,6 +1036,7 @@ private[celeborn] class Master(
nonEagerHandler.submit(new Runnable {
override def run(): Unit = {
workersAssignedToApp.remove(appId)
+ secretRegistry.unregister(appId);
Review Comment:
Discuss: I have a mild concern about the split logic to cleanup here ...
meta cleanup happens in `statusSystem.handleAppLost` vs unregisteration from
secret registery here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
