reverts

hail-is · Feb 17, 2023 · 0604a03 · 0604a03
1 parent bc3e16c
commit 0604a03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/hail/src/main/scala/is/hail/io/fs/FS.scala b/hail/src/main/scala/is/hail/io/fs/FS.scala
@@ -234,18 +234,20 @@ object FS {
   ): FS = retryTransientErrors {
     val (scheme, cloudSpecificFS) = using(new FileInputStream(credentialsPath)) { is =>
       val credentialsStr = Some(IOUtils.toString(is, Charset.defaultCharset()))
-      sys.env.get("HAIL_CLOUD").get match {
-        case "gcp" =>
+      sys.env.get("HAIL_CLOUD") match {
+        case Some("gcp") =>
           val requesterPaysConfiguration = flags.flatMap { flags =>
             RequesterPaysConfiguration.fromFlags(
               flags.get("gcs_requester_pays_project"), flags.get("gcs_requester_pays_buckets")
             )
           }
           ("gs", new GoogleStorageFS(credentialsStr, requesterPaysConfiguration).asCacheable())
-        case "azure" =>
+        case Some("azure") =>
           ("hail-az", new AzureStorageFS(credentialsStr).asCacheable())
         case cloud =>
           throw new IllegalArgumentException(s"Bad cloud: $cloud")
+        case None =>
+          throw new IllegalArgumentException(s"HAIL_CLOUD must be set.")
       }
     }
 

diff --git a/hail/src/main/scala/is/hail/io/fs/GoogleStorageFS.scala b/hail/src/main/scala/is/hail/io/fs/GoogleStorageFS.scala
@@ -273,6 +273,7 @@ class GoogleStorageFS(
       }
 
       override def close(): Unit = {
+        log.info(f"close: ${filename}")
         if (!closed) {
           flush()
           retryTransientErrors {