Added comments, fixed delete methods

Author: TetyanaYahodska

tpu/src/main/java/tpu/CreateQueuedResource.java

@@ -91,6 +91,8 @@ public static void createQueuedResource(String projectId, String zone,
               .build();
 
       QueuedResource response = tpuClient.createQueuedResourceAsync(request).get();
+      // You can wait until TPU Node is READY,
+      // and check its status using getTpuVm() from "tpu_vm_get" sample.
       System.out.printf("Queued Resource created: %s\n", response.getName());
     }
   }

tpu/src/main/java/tpu/DeleteForceQueuedResource.java

@@ -19,9 +19,12 @@
 //[START tpu_queued_resources_delete_force]
 
 import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.UnknownException;
 import com.google.cloud.tpu.v2alpha1.DeleteQueuedResourceRequest;
 import com.google.cloud.tpu.v2alpha1.TpuClient;
 import com.google.cloud.tpu.v2alpha1.TpuSettings;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
 import org.threeten.bp.Duration;
 
 public class DeleteForceQueuedResource {
@@ -37,7 +40,7 @@ public static void main(String[] args) {
     deleteForceQueuedResource(projectId, zone, queuedResourceId);
   }
 
-  // Deletes a Queued Resource asynchronously with force=true flag.
+  // Deletes a Queued Resource asynchronously with --force flag.
   public static void deleteForceQueuedResource(
       String projectId, String zone, String queuedResourceId) {
     String name = String.format("projects/%s/locations/%s/queuedResources/%s",
@@ -66,8 +69,8 @@ public static void deleteForceQueuedResource(
 
       tpuClient.deleteQueuedResourceAsync(request).get();
 
-    } catch (Exception e) {
-      System.out.println("Error unpacking QueuedResource: " + e.getMessage());
+    } catch (UnknownException | InterruptedException | ExecutionException | IOException e) {
+      System.out.println(e.getMessage());
     }
     System.out.printf("Deleted Queued Resource: %s\n", name);
   }

tpu/src/main/java/tpu/DeleteQueuedResource.java

@@ -19,16 +19,18 @@
 //[START tpu_queued_resources_delete]
 
 import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.UnknownException;
 import com.google.cloud.tpu.v2alpha1.DeleteQueuedResourceRequest;
+import com.google.cloud.tpu.v2alpha1.GetQueuedResourceRequest;
+import com.google.cloud.tpu.v2alpha1.QueuedResource;
 import com.google.cloud.tpu.v2alpha1.TpuClient;
 import com.google.cloud.tpu.v2alpha1.TpuSettings;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import org.threeten.bp.Duration;
 
 public class DeleteQueuedResource {
-  public static void main(String[] args)
-      throws IOException, ExecutionException, InterruptedException {
+  public static void main(String[] args) {
     // TODO(developer): Replace these variables before running the sample.
     // Project ID or project number of the Google Cloud project.
     String projectId = "YOUR_PROJECT_ID";
@@ -41,8 +43,7 @@ public static void main(String[] args)
   }
 
   // Deletes a Queued Resource asynchronously.
-  public static void deleteQueuedResource(String projectId, String zone, String queuedResourceId)
-      throws ExecutionException, InterruptedException {
+  public static void deleteQueuedResource(String projectId, String zone, String queuedResourceId) {
     String name = String.format("projects/%s/locations/%s/queuedResources/%s",
             projectId, zone, queuedResourceId);
     // With these settings the client library handles the Operation's polling mechanism
@@ -63,13 +64,21 @@ public static void deleteQueuedResource(String projectId, String zone, String qu
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
     try (TpuClient tpuClient = TpuClient.create(clientSettings.build())) {
+      // Retrive node name
+      GetQueuedResourceRequest getRequest =
+          GetQueuedResourceRequest.newBuilder().setName(name).build();
+      QueuedResource queuedResource = tpuClient.getQueuedResource(getRequest);
+      String nodeName = queuedResource.getTpu().getNodeSpec(0).getNode().getName();
+      // Before deleting the queued resource it is required to delete the TPU VM.
+      DeleteTpuVm.deleteTpuVm(projectId, zone, nodeName);
+
       DeleteQueuedResourceRequest request =
           DeleteQueuedResourceRequest.newBuilder().setName(name).build();
 
       tpuClient.deleteQueuedResourceAsync(request).get();
 
-    } catch (Exception e) {
-      System.out.println("Error unpacking QueuedResource: " + e.getMessage());
+    } catch (UnknownException | InterruptedException | ExecutionException | IOException e) {
+      System.out.println(e.getMessage());
     }
     System.out.printf("Deleted Queued Resource: %s\n", name);
   }

tpu/src/test/java/tpu/Util.java

@@ -61,14 +61,13 @@ public static void cleanUpExistingQueuedResources(
 
         com.google.cloud.tpu.v2alpha1.Node node = queuedResource.getTpu().getNodeSpec(0).getNode();
         String creationTime = formatTimestamp(node.getCreateTime());
-        String name = queuedResource.getName().substring(node.getName().lastIndexOf("/") + 1);
+        String name = queuedResource.getName()
+            .substring(queuedResource.getName().lastIndexOf("/") + 1);
         if (containPrefixToDeleteAndZone(queuedResource, prefixToDelete, zone)
             && isCreatedBeforeThresholdTime(creationTime)) {
           DeleteQueuedResource.deleteQueuedResource(projectId, zone, name);
         }
       }
-    } catch (ExecutionException | InterruptedException e) {
-      System.out.println("Exception for deleting QueuedResource: " + e.getMessage());
     }
   }