Changeset 1640:c35299928c59

Timestamp:

06/03/08 09:57:58 (3 months ago)

Author:

sandholm@…

Branch:

default

Message:

hadoop ui src update

Location:

src/grid/hadoop/gwt/src/com/hp/hpl/tycoon/ui/thundercloud

Files:

• client/ManageView.java (modified) (6 diffs)
• client/MasterView.java (modified) (3 diffs)
• client/index.java (modified) (2 diffs)
• public/slider/HorizontalSlider.css (modified) (1 diff)

src/grid/hadoop/gwt/src/com/hp/hpl/tycoon/ui/thundercloud/client/ManageView.java

@@ -44 +44 @@
  
   ConfigView config; 
+  MasterView master;
   Grid grid;
   Button createButton;
@@ -75 +76 @@
               config.setValue("time", Long.toString(time));
               tycoon.command("asynch create 1");
+              master.startCreation();
           } 
           if (sender == restartButton) {
@@ -112 +114 @@
       }
   }
-  public ManageView(ConfigView config, Tycoon tycoon) {
+  public ManageView(ConfigView config, MasterView master, Tycoon tycoon) {
       this.config = config;
       this.tycoon = tycoon;
+      this.master = master;
       grid = new Grid(5,2);
       panel.add(grid);
@@ -143 +146 @@
       //serverUrl = serverUrl.substring(0,stop);
       createButton = new Button("<img src=\"" + serverUrl +"/create.png\"/>&nbsp;Create", this);
-      createButton.setHeight("25px");
+      createButton.setHeight("27px");
+      createButton.setWidth("90px");
       restartButton = new Button("<img src=\"" + serverUrl +"/restart.png\"/>&nbsp;Restart", this);
-      restartButton.setHeight("25px");
+      restartButton.setHeight("27px");
+      restartButton.setWidth("90px");
       cleanButton = new Button("<img src=\"" + serverUrl +"/clean.png\"/>&nbsp;Clean", this);
-      cleanButton.setHeight("25px");
+      cleanButton.setHeight("27px");
+      cleanButton.setWidth("90px");
       terminateButton = new Button("<img src=\"" + serverUrl +"/delete.png\"/>&nbsp;Terminate", this);
-      terminateButton.setHeight("25px");
+      terminateButton.setHeight("27px");
+      terminateButton.setWidth("90px");
 
       updateNodeButton = new Button("<img src=\"" + serverUrl +"/refresh.png\"/>", this);
@@ -168 +175 @@
       memoryPanel.setText(0,1, "Memory (GiB):");
       spendingPanel.setWidget(0,0,updateSpendingButton);
-      spendingPanel.setText(0,1,"Spending Rate ($/day):");
+      spendingPanel.setText(0,1,"Spending ($/day):");
 
       grid.setWidget(0,0,nodePanel);
@@ -201 +208 @@
       spendingSlider.getSlider().setValue(0.1);
       grid.setWidget(3,1,spendingSlider);
-      HorizontalPanel buttonPanel = new HorizontalPanel();
-      buttonPanel.add(createButton);
-      buttonPanel.add(restartButton);
-      buttonPanel.add(cleanButton);
-      buttonPanel.add(terminateButton);
-      grid.setWidget(4,0,buttonPanel);
+      HorizontalPanel buttonPanel1 = new HorizontalPanel();
+      buttonPanel1.add(createButton);
+      buttonPanel1.add(restartButton);
+      grid.setWidget(4,0,buttonPanel1);
+      HorizontalPanel buttonPanel2 = new HorizontalPanel();
+      buttonPanel2.add(cleanButton);
+      buttonPanel2.add(terminateButton);
+      grid.setWidget(4,1,buttonPanel2);
       return panel;
   }

src/grid/hadoop/gwt/src/com/hp/hpl/tycoon/ui/thundercloud/client/MasterView.java

@@ -40 +40 @@
   Tycoon tycoon;
   String status = "down";
+  long progress = 0;
+  long tick = 0;
+  long progressTick = 0;
+  String budget = "";
+  String expires = "";
 
   public MasterView(Tycoon tycoon) {
       this.tycoon = tycoon;
+      this.progress = 0;
+      this.tick = 0;
+      this.progressTick = -1;
   }
 
   public void run() {
-     tycoon.masterStatus();
+     if (tick % 3 == 0) {
+         tycoon.masterStatus();
+     } 
+     if (this.progress < 95 && this.progressTick > 0) {
+         this.progress = (this.tick - this.progressTick)/2;
+         updateStatus();
+     }
+     tick += 10;
   }
 
@@ -53 +68 @@
       this.frame.setContent(new HTML("<center><img src=\"status_down.png\"/></center>" +
                                      "<br><b>Budget:</b><br>" +
+                                     "<br><b>Creation Progress:</b> " + Long.toString(this.progress) + "%<br>" +
                                      "<br><b>Expires:</b>")); 
       run();
-      scheduleRepeating(30000);
+      scheduleRepeating(10000);
+  }
+
+  public void startCreation() {
+      this.progress = 0;
+      this.progressTick = this.tick;
   }
 
@@ -61 +82 @@
       String[] stat = new_status.split("\n");
       //if (!stat[0].equals(this.status)) {
-      this.frame.setContent(new HTML("<center><img src=\"status_" + stat[0] + ".png\"/></center>" +
-                                     "<br><b>Budget:</b> $" + stat[1] + "<br>" +
-                                     "<br><b>Expires:</b> " + stat[2])); 
       //}
       if (stat[0].equals("up") && !this.status.equals("up")) {
           tycoon.getMaster();
+          this.progress = 100;
+          this.tick = 0;
+          this.progressTick = -1;
       }
-      this.status = new_status;
+      this.status = stat[0];
+      this.budget = stat[1];
+      this.expires = stat[2];
+      updateStatus();
+  }
+  public void updateStatus() {
+      this.frame.setContent(new HTML("<center><img src=\"status_" + this.status + ".png\"/></center>" +
+                                     "<br><b>Budget:</b> $" + this.budget + "<br>" +
+                                     "<br><b>Creation Progress:</b> " + Long.toString(this.progress) + "%<br>" +
+                                     "<br><b>Expires:</b> " + this.expires)); 
   }
 }

src/grid/hadoop/gwt/src/com/hp/hpl/tycoon/ui/thundercloud/client/index.java

@@ -117 +117 @@
     masterView = new MasterView(tycoon);
     statusView = new StatusView(tycoon,statusLabel);
-    manageView = new ManageView(configView, tycoon);
+    manageView = new ManageView(configView, masterView, tycoon);
     hadoopFSView = new HadoopFSView(configView, tycoon);
     hadoopJobView = new HadoopJobView(tycoon);
@@ -220 +220 @@
       image.minimize();
 
-      GInternalFrame master = new DefaultGInternalFrame("Cluster v0010");
+      GInternalFrame master = new DefaultGInternalFrame("Cluster v0025");
       frames[5] = master;
       desktop.addFrame(master);

src/grid/hadoop/gwt/src/com/hp/hpl/tycoon/ui/thundercloud/public/slider/HorizontalSlider.css

@@ -4 +4 @@
 
 .sph-Slider {
-        width: 500px;
+        width: 200px;
         height: 16px;
         border:none;