A ref change was pushed to the repository containing the project "Grayskull Repository". The branch, master has been updated via f1c58667bfbba74d518704571cd836356a3c9ab5 (commit) from 536832b8a25dbc7a448c5cffa2efeb58e2456f2c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f1c58667bfbba74d518704571cd836356a3c9ab5 Author: Justin Wozniak <[email protected]> Date: Mon Aug 31 17:07:02 2009 -0500 Ready to run VertexGroup comparisons. ----------------------------------------------------------------------- Summary of changes: sim/gobs/gobs.cfg | 4 ++-- sim/gobs/gobs/sim/PlacementScheme.java | 6 +++--- sim/gobs/gobs/sweep/Decluster04.java | 6 ++---- sim/gobs/params.cfg | 6 +++--- sim/gobs/sweeps/kp01.cfg | 8 ++++++-- sim/gobs/sweeps/kp02.cfg | 9 +++++++-- sim/gobs/sweeps/kp03.cfg | 9 +++++---- sim/gobs/sweeps/kp04.cfg | 9 +++++---- 8 files changed, 33 insertions(+), 24 deletions(-) Diff of changes: diff --git a/sim/gobs/gobs.cfg b/sim/gobs/gobs.cfg index f841394..4d9c679 100644 --- a/sim/gobs/gobs.cfg +++ b/sim/gobs/gobs.cfg @@ -3,11 +3,11 @@ printProperties = true # Print nodes and objects at startup (true/false) -printInitialNodes = false +printInitialNodes = true # Print nodes and objects after each rebuild (true/false) printNodes = false # Print object tranfers during rebuilds (true/false) -printRebuilds = false +printRebuilds = true # Print file information (true/false) printFiles = false # Print load change statistics (true/false) diff --git a/sim/gobs/gobs/sim/PlacementScheme.java b/sim/gobs/gobs/sim/PlacementScheme.java index b8c0d52..9607618 100644 --- a/sim/gobs/gobs/sim/PlacementScheme.java +++ b/sim/gobs/gobs/sim/PlacementScheme.java @@ -102,7 +102,7 @@ public abstract class PlacementScheme simulator.stats.flexibilities.add(sites.size()); Primary primary = object.toPrimary(); sites.remove(sites.size()-1).add(primary); - for (int i = 0; i < object.replicas; i++) + for (int i = 0; i < object.replicas-1; i++) { if (sites.size() == 0) { @@ -132,7 +132,7 @@ public abstract class PlacementScheme */ void rebuild(Obj object, List<Node> nodes) { - System.out.println("rebuild: " + object.toString(simulator)); + // System.out.println("rebuild: " + object.toString(simulator)); List<Node> sites = sites(object, nodes); // System.out.println("sites.size(): " + sites.size()); Secondary secondary; @@ -141,7 +141,7 @@ public abstract class PlacementScheme { Primary primary = (Primary) object; Node primarySite = lookup(object.id, nodes); - System.out.println("primary: " + primarySite.name(simulator)); + // System.out.println("primary: " + primarySite.name(simulator)); if (primarySite.contains(object.id)) { secondary = (Secondary) primarySite.remove(object.id); diff --git a/sim/gobs/gobs/sweep/Decluster04.java b/sim/gobs/gobs/sweep/Decluster04.java index 8481fd2..ecdd5f3 100644 --- a/sim/gobs/gobs/sweep/Decluster04.java +++ b/sim/gobs/gobs/sweep/Decluster04.java @@ -37,20 +37,18 @@ class Decluster04 final XYSeriesCollection collection = new XYSeriesCollection(); - /* properties.setProperty("PlacementScheme", "Nearest"); - Sweep nearestSweep = new ParallelSweep(properties); + Sweep nearestSweep = new Sweep(properties); nearestSweep.repeats = Tools.integer(properties, "repeats"); nearestSweep.execute("PAST", "nodes", values, "maxTotal"); collection.addSeries(nearestSweep.series); properties.setProperty("PlacementScheme", "Kademlia"); - Sweep kademliaSweep = new ParallelSweep(properties); + Sweep kademliaSweep = new Sweep(properties); kademliaSweep.repeats = Tools.integer(properties, "repeats"); kademliaSweep.execute("Kademlia", "nodes", values, "maxTotal"); collection.addSeries(kademliaSweep.series); - */ properties.setProperty("PlacementScheme", "VertexGroups"); Sweep vgSweep = new Sweep(properties); diff --git a/sim/gobs/params.cfg b/sim/gobs/params.cfg index f0fe63d..32e9982 100644 --- a/sim/gobs/params.cfg +++ b/sim/gobs/params.cfg @@ -6,9 +6,9 @@ # Bit-length of addresses: B = 16 # Number of servers: -nodes = 16 +nodes = 128 # Number of files: -files = 2 +files = 1000 # Number of faults: faults = 1 @@ -18,7 +18,7 @@ faults = 1 #PlacementScheme = Nearest PlacementScheme = VertexGroups -VertexGroupPrefix = 5 +VertexGroupPrefix = 6 ReplaceSourcePrimary = false ### Choose a NodeScheme implementation: diff --git a/sim/gobs/sweeps/kp01.cfg b/sim/gobs/sweeps/kp01.cfg index b189818..4d29bbb 100644 --- a/sim/gobs/sweeps/kp01.cfg +++ b/sim/gobs/sweeps/kp01.cfg @@ -1,7 +1,7 @@ ### Kademlia vs. PAST 01 -step = mids +step = exps ### General parameters: @@ -13,13 +13,16 @@ files = 3000 faults = 1 # Number of servers: -minNodes = 10 +minNodes = 20 maxNodes = 1000 ### Choose a PlacementScheme implementation: # Chosen by sweep driver. +ReplaceSourcePrimary = false +VertexGroupPrefix = 5 + ### Choose a NodeScheme implementation: # NodeScheme = RandomNodes @@ -58,6 +61,7 @@ filewidth = 10 ### Simulator output configuration +printProperties = true # Print nodes and objects at startup (true/false) printInitialNodes = false # Print nodes and objects after each rebuild (true/false) diff --git a/sim/gobs/sweeps/kp02.cfg b/sim/gobs/sweeps/kp02.cfg index c0f69c6..ba0332c 100644 --- a/sim/gobs/sweeps/kp02.cfg +++ b/sim/gobs/sweeps/kp02.cfg @@ -1,7 +1,7 @@ ### Kademlia vs. PAST 02 -step = mids +step = exps ### General parameters: @@ -13,13 +13,17 @@ files = 3000 faults = 1 # Number of servers: -minNodes = 10 +minNodes = 20 maxNodes = 1000 ### Choose a PlacementScheme implementation: # Chosen by sweep driver. +ReplaceSourcePrimary = false +VertexGroupPrefix = 5 + + ### Choose a NodeScheme implementation: NodeScheme = RandomNodes @@ -58,6 +62,7 @@ filewidth = 10 ### Simulator output configuration +printProperties = false # Print nodes and objects at startup (true/false) printInitialNodes = false # Print nodes and objects after each rebuild (true/false) diff --git a/sim/gobs/sweeps/kp03.cfg b/sim/gobs/sweeps/kp03.cfg index af729f7..6d0b28f 100644 --- a/sim/gobs/sweeps/kp03.cfg +++ b/sim/gobs/sweeps/kp03.cfg @@ -1,7 +1,7 @@ ### Kademlia vs. PAST 03 -step = mids +step = exps ### General parameters: @@ -13,14 +13,15 @@ files = 3000 faults = 1 # Number of servers: -minNodes = 10 +minNodes = 20 maxNodes = 1000 ### Choose a PlacementScheme implementation: -# Chosen by sweep driver +# Chosen by sweep driver. ReplaceSourcePrimary = false +VertexGroupPrefix = 5 ### Choose a NodeScheme implementation: @@ -61,7 +62,7 @@ filewidth = 10 ### Simulator output configuration # Dump properties for each Simulator execution -printProperties = false +printProperties = true # Print nodes and objects at startup (true/false) printInitialNodes = false # Print nodes and objects after each rebuild (true/false) diff --git a/sim/gobs/sweeps/kp04.cfg b/sim/gobs/sweeps/kp04.cfg index b47fb06..4fe4b03 100644 --- a/sim/gobs/sweeps/kp04.cfg +++ b/sim/gobs/sweeps/kp04.cfg @@ -1,7 +1,7 @@ ### Kademlia vs. PAST 04 -step = mids +step = exps ### General parameters: @@ -13,14 +13,15 @@ files = 3000 faults = 1 # Number of servers: -minNodes = 10 -maxNodes = 100 +minNodes = 20 +maxNodes = 1000 ### Choose a PlacementScheme implementation: -# Chosen by sweep driver +# Chosen by sweep driver. ReplaceSourcePrimary = false +VertexGroupPrefix = 5 ### Choose a NodeScheme implementation: hooks/post-receive -- Grayskull Repository