Navigation Menu

Skip to content

Commit

Permalink
Shorten method name
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 21, 2015
1 parent 5e3a2a1 commit f8d565c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions bin/droonga-engine-join
Expand Up @@ -221,7 +221,7 @@ module Droonga
def set_source_node_role
if absorber.source_node_suspendable?
puts("Changing role of the source node...")
source_node_serf.do_and_wait_restart do
source_node_serf.ensure_restarted do
source_node_serf.send_query("change_role",
"node" => source_node.to_s,
"role" => NodeRole::ABSORB_SOURCE)
Expand All @@ -232,7 +232,7 @@ module Droonga

def set_joining_node_role
puts("Changing role of the joining node...")
joining_node_serf.do_and_wait_restart do
joining_node_serf.ensure_restarted do
joining_node_serf.send_query("change_role",
"node" => joining_node.to_s,
"role" => NodeRole::ABSORB_DESTINATION)
Expand All @@ -243,7 +243,7 @@ module Droonga
def reset_source_node_role
if absorber.source_node_suspendable?
puts("Restoring role of the source node...")
source_node_serf.do_and_wait_restart do
source_node_serf.ensure_restarted do
source_node_serf.send_query("change_role",
"node" => source_node.to_s,
"role" => NodeRole::SERVICE_PROVIDER)
Expand All @@ -254,7 +254,7 @@ module Droonga

def reset_joining_node_role
puts("Restoring role of the joining node...")
joining_node_serf.do_and_wait_restart do
joining_node_serf.ensure_restarted do
joining_node_serf.send_query("change_role",
"node" => joining_node.to_s,
"role" => NodeRole::SERVICE_PROVIDER)
Expand All @@ -264,7 +264,7 @@ module Droonga

def do_join
puts("Joining new replica to the cluster...")
joining_node_serf.do_and_wait_restart do
joining_node_serf.ensure_restarted do
joining_node_serf.send_query("join",
"node" => joining_node.to_s,
"type" => "replica",
Expand Down Expand Up @@ -313,7 +313,7 @@ module Droonga

def register_to_existing_nodes
puts("Register new node to existing hosts in the cluster...")
source_node_serf.do_and_wait_restart do
source_node_serf.ensure_restarted do
source_node_serf.send_query("add_replicas",
"cluster_id" => source_cluster_id,
"dataset" => dataset,
Expand All @@ -324,7 +324,7 @@ module Droonga

def unregister_from_existing_nodes
puts("Unregister new node from existing hosts in the cluster...")
source_node_serf.do_and_wait_restart do
source_node_serf.ensure_restarted do
source_node_serf.send_query("remove_replicas",
"cluster_id" => source_cluster_id,
"dataset" => dataset,
Expand Down
2 changes: 1 addition & 1 deletion lib/droonga/serf.rb
Expand Up @@ -221,7 +221,7 @@ def cluster_id
CHECK_RESTARTED_INTERVAL = 3
CHECK_RESTARTED_TIMEOUT = 60 * 5

def do_and_wait_restart(&block)
def ensure_restarted(&block)
start_time = Time.now
previous_internal_name = get_tag("internal-name")
yield # the given operation must restart the service.
Expand Down

0 comments on commit f8d565c

Please sign in to comment.