Merge branch 'secondaryx' into adjust_1.2.0

roma · Oct 1, 2015 · 264c338 · 264c338
2 parents cf3a612 + 40dbb2c
commit 264c338
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 29 deletions.
diff --git a/app/assets/javascripts/cluster.js b/app/assets/javascripts/cluster.js
@@ -114,8 +114,12 @@ $(window).load(function() {
 
                     // secondary node
                     rd = parseInt(data[instanceName]["redundant"])
-                    for(i = 0; i < rd; i++ ){
-                        updateVnodesCount(data, instanceName, "secondary_nodes"+(i+1))
+                    if (data[instanceName]["version"].match(/^1\.[01]\.0/)) {
+                        updateVnodesCount(data, instanceName, "secondary_nodes")
+                    } else {
+                        for(i = 0; i < rd-1; i++ ){
+                            updateVnodesCount(data, instanceName, "secondary_nodes"+(i+1))
+                        }
                     }
 
                     if (instanceName == gon.host+"_"+gon.port) {
@@ -137,8 +141,13 @@ $(window).load(function() {
             case "release":
                 sum_vnodes = parseInt(data["primary_nodes"]);
                 rd = parseInt(data["redundant"])
-                for(i = 0; i < rd-1; i++ ){
-                    sum_vnodes += parseInt(data["secondary_nodes"+(i+1)]);
+
+                if (data["version"].match(/^1\.[01]\.0/)) {
+                    sum_vnodes += parseInt(data["secondary_nodes"]);
+                } else {
+                    for(i = 0; i < rd-1; i++ ){
+                        sum_vnodes += parseInt(data["secondary_nodes"+(i+1)]);
+                    }
                 }
                 progressRate = Math.round((1-(sum_vnodes/gon.denominator)) * 1000) /10
 
@@ -165,10 +174,13 @@ $(window).load(function() {
             case "release":
                 sum_vnodes = parseInt(data["primary_nodes"]);
                 rd = parseInt(data["redundant"])
-                for(i = 0; i < rd; i++ ){
-                    sum_vnodes += parseInt(data["secondary_nodes"+(i+1)]);
+                if (data["version"].match(/^1\.[01]\.0/)) {
+                    sum_vnodes += parseInt(data["secondary_nodes"]);
+                } else {
+                    for(i = 0; i < rd-1; i++ ){
+                        sum_vnodes += parseInt(data["secondary_nodes"+(i+1)]);
+                    }
                 }
-
                 progressRate = Math.round((1-(sum_vnodes/gon.denominator)) * 1000) /10
 
                 if (progressRate == 100) {

diff --git a/app/assets/stylesheets/cluster.css b/app/assets/stylesheets/cluster.css
@@ -207,7 +207,16 @@ li.version-diff-info {
 
 .cluster-type-panel .panel-name {
   color: white;
-
+  filter:dropshadow(color=grey,offX= 0,offY=-1)
+  dropshadow(color=grey,offX= 1,offY= 0)
+  dropshadow(color=grey,offX= 0,offY= 1)
+  dropshadow(color=grey,offX=-1,offY= 0);
+
+  -webkit-text-stroke-color: grey;
+  -webkit-text-stroke-width: 0.1px;
+
+  text-shadow: grey 1px 1px 0px, grey -1px 1px 0px,
+               grey 1px -1px 0px, grey -1px -1px 0px;  
 }
 .cluster-type-panel .panel-value {
   text-align: center;
@@ -241,13 +250,18 @@ li.version-diff-info {
 .instance-table {
   background-color: #ffffff;
   margin: 10px;
+  overflow:auto;
 }
 
 .instance-table td {
   text-align: center;
   vertical-align: middle;
 }
 
+.cluster-table {
+  margin: 0;
+}
+
 td.instance-status-column {
   min-width: 100px;
   text-align: left;

diff --git a/app/controllers/cluster_controller.rb b/app/controllers/cluster_controller.rb
@@ -18,10 +18,13 @@ def index
           # in case of release was executing by console or login by other users
           if !session[:denominator]
             session[:denominator] = info["primary_nodes"]
-            (info["redundant"]-1).times{|i|
-              session[:denominator] += info["secondary_nodes#{i+1}"] 
-            }
-
+            if view_context.chk_roma_version(@stats_hash['others']['version']) < Constants::VERSION_1_2_0
+              session[:denominator] += info["secondary_nodes"] 
+            else
+              (info["redundant"]-1).times{|i|
+                session[:denominator] += info["secondary_nodes#{i+1}"] 
+              }
+            end
           end
           gon.denominator = session[:denominator]
           gon.routing_info = @routing_info
@@ -101,9 +104,13 @@ def release #[release]
     @routing_info = roma.get_routing_info(@active_routing_list)
     gon.routing_info = @routing_info
     session[:denominator] = @routing_info[params[:target_instance]]["primary_nodes"]
-    (@stats_hash["routing"]["redundant"].to_i - 1).times{|i|
-      session[:denominator] += @routing_info[params[:target_instance]]["secondary_nodes#{i+1}"]
-    }
+    if view_context.chk_roma_version(@stats_hash['others']['version']) < Constants::VERSION_1_2_0
+      session[:denominator] += @routing_info[params[:target_instance]]["secondary_nodes"]
+    else
+      (@stats_hash["routing"]["redundant"].to_i - 1).times{|i|
+        session[:denominator] += @routing_info[params[:target_instance]]["secondary_nodes#{i+1}"]
+      }
+    end
     gon.denominator = session[:denominator]
 
     render :action => "index"

diff --git a/app/helpers/cluster_helper.rb b/app/helpers/cluster_helper.rb
@@ -132,7 +132,12 @@ def released_flg?(routing_info)
     return true if session[:released]
     routing_info.each{|instance, info|
       sum_secondary = 0
-      if info["redundant"]
+
+      # for v1.0.0-1.1.0
+      if info["secondary_nodes"]
+        sum_secondary += info["secondary_nodes"]
+      # for v1.2.0-
+      elsif info["redundant"]
         (info["redundant"]-1).times{|i|
           sum_secondary += info["secondary_nodes#{i+1}"]
         }

diff --git a/app/models/roma.rb b/app/models/roma.rb
@@ -209,6 +209,8 @@ def get_routing_info(active_routing_list, *option_params)
       begin
         each_stats = self.get_stats(instance.split("_")[0], instance.split("_")[1])
 
+
+
         ### status[active|inactive|recover|join]
         if each_stats["stats"]["run_recover"].chomp == "true"
           status = "recover"
@@ -237,9 +239,14 @@ def get_routing_info(active_routing_list, *option_params)
 
         ### vnodes count
         routing_list_info[instance]["primary_nodes"] = each_stats["routing"]["primary"].to_i
-        (rd-1).times{|i|
-          routing_list_info[instance]["secondary_nodes#{i+1}"] = each_stats["routing"]["secondary#{i+1}"].to_i
-        }
+
+        if ApplicationController.helpers.chk_roma_version(@stats_hash['others']['version']) < Constants::VERSION_1_2_0
+          routing_list_info[instance]["secondary_nodes"] = each_stats["routing"]["secondary"].to_i
+        else
+          (rd-1).times{|i|
+            routing_list_info[instance]["secondary_nodes#{i+1}"] = each_stats["routing"]["secondary#{i+1}"].to_i
+          }
+        end
 
         ### option params
         unless option_params.empty?

diff --git a/app/views/cluster/index.html.erb b/app/views/cluster/index.html.erb
@@ -170,17 +170,25 @@
             <th rowspan="2">Data rate</th>
             <th rowspan="2" class="datasize-column">Data size</th>
           <% end %>
-          <!--<th colspan="2">vnodes count</th>-->
-          <th colspan="<%= @stats_hash['routing']['redundant'] %>">vnodes count</th>
+          <% if chk_roma_version(@stats_hash['others']['version']) < Constants::VERSION_1_2_0 %>
+            <th colspan="2">vnodes count</th>
+          <% else %>
+            <th colspan="<%= @stats_hash['routing']['redundant'] %>">vnodes count</th>
+          <% end %>
           <% if session[:user_type] == 'root' %>
             <th rowspan="2" class="button-column">&nbsp;</th>
           <% end %>
         </tr>
         <tr>
           <th class="vnodes-column">Primary</th>
-          <% (@stats_hash['routing']['redundant'].to_i - 1).times{|i| %>
-            <th class="vnodes-column filter-false">Secondary<%= i+1 %></th>
-          <% } %>
+          <% if chk_roma_version(@stats_hash['others']['version']) < Constants::VERSION_1_2_0 %>
+            <th class="vnodes-column filter-false">Secondary</th>
+          <% else %>
+            <% (@stats_hash['routing']['redundant'].to_i - 1).times{|i| %>
+              <th class="vnodes-column filter-false">Secondary<%= i+1 %></th>
+            <% } %>
+          <% end %>
+
         </tr>
       </thead>
       <tbody class="table-contents">
@@ -250,14 +258,22 @@
                 <%= info["primary_nodes"] %>
               </span>
             </td>
-
-            <% (@stats_hash['routing']['redundant'].to_i - 1).times{|i|  %>
+            <!-- Secondary nodes -->
+            <% if chk_roma_version(@stats_hash['others']['version']) < Constants::VERSION_1_2_0 %>
               <td>
-                <span id="secondary-nodes<%= i+1 %>-<%= instance.gsub(/[^0-9]/,'') %>">
-                  <%= info["secondary_nodes#{i+1}"] %>
+                <span id="secondary-nodes-<%= instance.gsub(/[^0-9]/,'') %>">
+                  <%= info["secondary_nodes"] %>
                 </span>
               </td>
-            <% } %>
+            <% else %>
+              <% (@stats_hash['routing']['redundant'].to_i - 1).times{|i|  %>
+                <td>
+                  <span id="secondary-nodes<%= i+1 %>-<%= instance.gsub(/[^0-9]/,'') %>">
+                    <%= info["secondary_nodes#{i+1}"] %>
+                  </span>
+                </td>
+              <% } %>
+            <% end %>
 
             <!-- release/rbalse button(for root user) -->
             <% if session[:user_type] == 'root' %>