Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WX-751 Token refresh signal for monitoring #6939

Merged
merged 2 commits into from
Oct 28, 2022
Merged

WX-751 Token refresh signal for monitoring #6939

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99e6d9f
Log messges
aednichols Oct 24, 2022
2634cb7
`DEBUG` -> `INFO`
aednichols Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobFileSystemManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import java.time.{Duration, Instant, OffsetDateTime}
import scala.jdk.CollectionConverters._
import scala.util.{Failure, Success, Try}
import com.azure.resourcemanager.storage.models.StorageAccountKey
import com.typesafe.scalalogging.LazyLogging

case class FileSystemAPI() {
def getFileSystem(uri: URI): Try[FileSystem] = Try(FileSystems.getFileSystem(uri))
Expand Down Expand Up @@ -44,7 +45,7 @@ case class BlobFileSystemManager(
expiryBufferMinutes: Long,
blobTokenGenerator: BlobTokenGenerator,
fileSystemAPI: FileSystemAPI = FileSystemAPI(),
private val initialExpiration: Option[Instant] = None) {
private val initialExpiration: Option[Instant] = None) extends LazyLogging {
private var expiry: Option[Instant] = initialExpiration
val buffer: Duration = Duration.of(expiryBufferMinutes, ChronoUnit.MINUTES)

Expand All @@ -57,10 +58,13 @@ case class BlobFileSystemManager(
shouldReopenFilesystem match {
case false => fileSystemAPI.getFileSystem(uri).recoverWith {
// If no filesystem already exists, this will create a new connection, with the provided configs
case _: FileSystemNotFoundException => blobTokenGenerator.generateAccessToken.flatMap(generateFilesystem(uri, container, _))
case _: FileSystemNotFoundException =>
logger.info(s"Creating new blob filesystem for URI $uri")
blobTokenGenerator.generateAccessToken.flatMap(generateFilesystem(uri, container, _))
}
// If the token has expired, OR there is no token record, try to close the FS and regenerate
case true =>
logger.info(s"Closing & regenerating token for existing blob filesystem at URI $uri")
fileSystemAPI.closeFileSystem(uri)
blobTokenGenerator.generateAccessToken.flatMap(generateFilesystem(uri, container, _))
}
Expand Down