Permalink
Browse files

Merge branch 'master' of github.com:jarulraj/h-store

Conflicts:
	experiment.sh
	properties/benchmarks/ycsb.properties
  • Loading branch information...
jarulraj committed Mar 14, 2014
2 parents 796a159 + d1eef1f commit 995f71674b003b887ad07a1218733a70f8b1a50f
View
@@ -144,6 +144,7 @@
<arg value="site.anticache_enable=${site.anticache_enable}" />
<arg value="site.anticache_build=${site.anticache_build}" />
<arg value="site.anticache_reversible_lru=${site.anticache_reversible_lru}" />
<arg value="site.anticache_nvm=${site.anticache_nvm}" />
<arg value="site.anticache_profiling=${site.anticache_profiling}" />
<arg value="site.anticache_dir=${site.anticache_dir}" />
<arg value="site.anticache_block_size=${site.anticache_block_size}" />
View
@@ -79,7 +79,7 @@
# these are the base compile options that get added to every compile step
# this does not include header/lib search paths or specific flags for
# specific targets
CTX.CPPFLAGS = """-Wall -Wextra -Werror -Woverloaded-virtual -Wconversion
CTX.CPPFLAGS = """ -Wextra -Woverloaded-virtual -Wconversion
-Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings
-Winit-self -Wno-sign-compare -Wno-unused-parameter
-pthread
@@ -399,8 +399,14 @@
if CTX.ANTICACHE_BUILD:
CTX.CPPFLAGS += " -DANTICACHE"
if CTX.ANTICACHE_NVM:
CTX.CPPFLAGS += " -DANTICACHE_NVM"
if CTX.ANTICACHE_REVERSIBLE_LRU:
CTX.CPPFLAGS += " -DANTICACHE_REVERSIBLE_LRU"
if CTX.ANTICACHE_DRAM:
CTX.CPPFLAGS += " -DANTICACHE_DRAM"
# Bring in berkeleydb library
CTX.SYSTEM_DIRS.append(os.path.join(CTX.OUTPUT_PREFIX, 'berkeleydb'))
View
@@ -867,6 +867,7 @@ NATIVE EE STUFF
<arg value="ANTICACHE_ENABLE=${site.anticache_enable}" />
<arg value="ANTICACHE_BUILD=${site.anticache_build}" />
<arg value="ANTICACHE_REVERSIBLE_LRU=${site.anticache_reversible_lru}" />
<arg value="ANTICACHE_NVM=${site.anticache_nvm}" />
<arg value="${build}" />
</exec>
</target>
View
@@ -38,10 +38,13 @@ def __init__(self, args):
self.NM = "/usr/bin/nm"
self.NMFLAGS = "-n" # specialized by platform in build.py
self.COVERAGE = False
self.LOG_LEVEL = "DEBUG"
self.VOLT_LOG_LEVEL = None
self.STORAGE_MMAP = False
self.ANTICACHE_BUILD = False
self.ANTICACHE_REVERSIBLE_LRU = False
self.ANTICACHE_BUILD = True
self.ANTICACHE_REVERSIBLE_LRU = True
self.ANTICACHE_NVM = True
self.ANTICACHE_DRAM = True
self.ARIES= False
self.SNAPSHOT= False
@@ -82,6 +85,10 @@ def __init__(self, args):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
self.ANTICACHE_REVERSIBLE_LRU = bool(parts[1])
if arg.startswith("ANTICACHE_NVM="):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
self.ANTICACHE_NVM = bool(parts[1])
if arg.startswith("LOG_LEVEL="):
parts = arg.split("=")
View
@@ -83,6 +83,8 @@ echo "---------------------------------------------------------"
for PARAM; do
echo $PARAM
done
=======
>>>>>>> 57bdfa5eccbda3311d90d6003702fa65528ec377:ycsb.sh
# ---------------------------------------------------------------------
@@ -95,25 +97,29 @@ function onexit() {
# ---------------------------------------------------------------------
ENABLE_ANTICACHE=true
SITE_HOST="10.212.84.152"
CLIENT_HOSTS=( \
"10.212.84.152" \
"10.212.84.152" \
"client1" \
"client2" \
"10.212.84.152" \
"10.212.84.152" \
)
#BASE_SITE_MEMORY=8192
#BASE_SITE_MEMORY_PER_PARTITION=0
BASE_CLIENT_THREADS=1
#BASE_SITE_MEMORY_PER_PARTITION=1024
BASE_SITE_MEMORY=8192
BASE_SITE_MEMORY_PER_PARTITION=750
BASE_PROJECT="ycsb"
BASE_DIR=`readlink -f /home/user/joy/h-store`
OUTPUT_DIR="~/data/ycsb/read-heavy/2/80-20"
#ANTICACHE_BLOCK_SIZE=131072
#ANTICACHE_BLOCK_SIZE=262144
ANTICACHE_BLOCK_SIZE=524288
#ANTICACHE_BLOCK_SIZE=1048576
#ANTICACHE_BLOCK_SIZE=2097152
#ANTICACHE_BLOCK_SIZE=4194304
#ANTICACHE_BLOCK_SIZE=131072
ANTICACHE_THRESHOLD=.5
BASE_ARGS=( \
# SITE DEBUG
@@ -135,7 +141,7 @@ BASE_ARGS=( \
"-Dsite.cpu_affinity_one_partition_per_core=true" \
#"-Dsite.cpu_partition_blacklist=0,2,4,6,8,10,12,14,16,18" \
#"-Dsite.cpu_utility_blacklist=0,2,4,6,8,10,12,14,16,18" \
#"-Dsite.network_incoming_limit_txns=10000" \
"-Dsite.network_incoming_limit_txns=10000" \
"-Dsite.commandlog_enable=true" \
"-Dsite.txn_incoming_delay=5" \
"-Dsite.exec_postprocessing_threads=false" \
@@ -211,23 +217,11 @@ for CLIENT_HOST in ${CLIENT_HOSTS[@]}; do
fi
done
for HOST in ${HOSTS_TO_UPDATE[@]}; do
echo "BASE DIR : " $BASE_DIR
if [ "$REBUILD" = "false" ]; then
echo "REUSING BINARIES"
else
echo "CLEANING AND REBUILDING BINARIES"
ssh $HOST "cd $BASE_DIR && git pull && ant compile"
fi
ssh $HOST "cd $BASE_DIR && git pull && ant compile" &
done
wait
if [ "$REBUILD" = "false" ]; then
echo "REUSING BINARIES"
else
echo "CLEANING AND REBUILDING BINARIES"
ant compile
fi
ant compile
for i in 8; do
HSTORE_HOSTS="${SITE_HOST}:0:0-"`expr $i - 1`
@@ -265,8 +259,9 @@ for i in 8; do
-Dproject=${BASE_PROJECT} \
-Dkillonzero=false \
-Dclient.threads_per_host=4 \
-Dsite.memory=${SITE_MEMORY} \
-Dclient.hosts=${CLIENT_HOSTS_STR} \
-Dclient.count=${CLIENT_COUNT}
-Dclient.count=${CLIENT_COUNT}
result=$?
if [ $result != 0 ]; then
exit $result
View
@@ -63,6 +63,7 @@ log4j.logger.edu.brown.markov=INFO
log4j.logger.edu.brown.mappings=INFO
log4j.logger.edu.brown.costmodel=INFO
log4j.logger.edu.brown.designer=INFO
log4j.logger.edu.brown.hstore.AntiCacheManager=INFO
## ----------------------------------------------------------------------------
## FAST LOGGING
@@ -7,7 +7,7 @@ builder = edu.brown.benchmark.ycsb.YCSBProjectBuilder
# If 'fixed_size' is set to true, then then the YCSBLoader will
# only add the number of tuples defined in 'num_records'
fixed_size = true
num_records = 1000000
num_records = 10000
# Zipfian skew factor for tuple access
skew_factor = 0.5
View
@@ -11,25 +11,30 @@ function onexit() {
# ---------------------------------------------------------------------
ENABLE_ANTICACHE=false
ENABLE_ANTICACHE=true
SITE_HOST="istc12"
SITE_HOST="10.212.84.152"
CLIENT_HOSTS=( \
"istc12" \
"istc13" \
"istc13" \
"client1" \
"client2" \
"10.212.84.152" \
"10.212.84.152" \
)
BASE_CLIENT_THREADS=2
BASE_CLIENT_THREADS=1
#BASE_SITE_MEMORY=8192
#BASE_SITE_MEMORY_PER_PARTITION=1024
BASE_SITE_MEMORY=8192
BASE_SITE_MEMORY_PER_PARTITION=1024
BASE_SITE_MEMORY_PER_PARTITION=750
BASE_PROJECT="ycsb"
BASE_DIR=`pwd`
OUTPUT_DIR="~/data/ycsb/read-heavy/2/80-20"
#ANTICACHE_BLOCK_SIZE=524288
ANTICACHE_BLOCK_SIZE=1048576
#ANTICACHE_BLOCK_SIZE=131072
#ANTICACHE_BLOCK_SIZE=262144
ANTICACHE_BLOCK_SIZE=524288
#ANTICACHE_BLOCK_SIZE=1048576
#ANTICACHE_BLOCK_SIZE=2097152
#ANTICACHE_BLOCK_SIZE=4194304
#ANTICACHE_BLOCK_SIZE=131072
@@ -43,7 +48,7 @@ BASE_ARGS=( \
# "-Dsite.status_check_for_zombies=true" \
# "-Dsite.exec_profiling=true" \
# "-Dsite.profiling=true" \
# "-Dsite.txn_counters=true" \
# "-Dsite.txn_counters=true" \
# "-Dsite.pool_profiling=true" \
# "-Dsite.network_profiling=false" \
# "-Dsite.log_backup=true"\
@@ -55,11 +60,10 @@ BASE_ARGS=( \
"-Dsite.cpu_affinity_one_partition_per_core=true" \
#"-Dsite.cpu_partition_blacklist=0,2,4,6,8,10,12,14,16,18" \
#"-Dsite.cpu_utility_blacklist=0,2,4,6,8,10,12,14,16,18" \
"-Dsite.network_incoming_limit_txns=50000" \
"-Dsite.network_incoming_limit_txns=10000" \
"-Dsite.commandlog_enable=true" \
"-Dsite.txn_incoming_delay=5" \
"-Dsite.exec_postprocessing_threads=true" \
"-Dsite.anticache_profiling=${ENABLE_ANTICACHE}" \
"-Dsite.exec_postprocessing_threads=false" \
"-Dsite.anticache_eviction_distribution=even" \
# "-Dsite.queue_allow_decrease=true" \
@@ -69,27 +73,27 @@ BASE_ARGS=( \
# Client Params
"-Dclient.scalefactor=1" \
"-Dclient.memory=2048" \
"-Dclient.txnrate=2000" \
"-Dclient.warmup=120000" \
"-Dclient.duration=120000" \
"-Dclient.interval=5000" \
"-Dclient.txnrate=10000" \
"-Dclient.warmup=60000" \
"-Dclient.duration=60000" \
"-Dclient.interval=20000" \
"-Dclient.shared_connection=false" \
"-Dclient.blocking=false" \
"-Dclient.blocking_concurrent=100" \
"-Dclient.throttle_backoff=100" \
"-Dclient.output_interval=5000" \
"-Dclient.output_interval=10000" \
# "-Dclient.output_anticache_evictions=evictions.csv" \
# "-Dclient.output_memory=memory.csv" \
# Anti-Caching Experiments
"-Dsite.anticache_enable=${ENABLE_ANTICACHE}" \
# "-Dsite.anticache_profiling=true" \
"-Dsite.anticache_profiling=false" \
"-Dsite.anticache_reset=false" \
"-Dsite.anticache_block_size=${ANTICACHE_BLOCK_SIZE}" \
"-Dsite.anticache_check_interval=10000" \
"-Dsite.anticache_threshold_mb=200" \
"-Dsite.anticache_blocks_per_eviction=200" \
"-Dsite.anticache_max_evicted_blocks=325" \
"-Dsite.anticache_check_interval=5000" \
"-Dsite.anticache_threshold_mb=600" \
"-Dsite.anticache_blocks_per_eviction=1000" \
"-Dsite.anticache_max_evicted_blocks=1000" \
# "-Dsite.anticache_evict_size=${ANTICACHE_EVICT_SIZE}" \
"-Dsite.anticache_threshold=${ANTICACHE_THRESHOLD}" \
"-Dclient.anticache_enable=false" \
@@ -168,12 +172,12 @@ for i in 8; do
fi
done
wait
# EXECUTE BENCHMARK
ant hstore-benchmark ${BASE_ARGS[@]} \
-Dproject=${BASE_PROJECT} \
-Dkillonzero=false \
-Dclient.threads_per_host=${NUM_CLIENTS} \
-Dclient.threads_per_host=4 \
-Dsite.memory=${SITE_MEMORY} \
-Dclient.hosts=${CLIENT_HOSTS_STR} \
-Dclient.count=${CLIENT_COUNT}
@@ -1270,8 +1270,8 @@ public void runBenchmark() throws Exception {
// if (debug.val)
LOG.info(String.format("ClientStatusThread '%s' asked to finish up", t.getName()));
// System.err.println(StringUtil.join("\n", t.getStackTrace()));
t.interrupt();
t.join();
t.interrupt();
t.join(3000);
}
} // FOR
} catch (InterruptedException e) {
@@ -39,6 +39,7 @@
import edu.brown.api.BenchmarkComponent;
import edu.brown.benchmark.ycsb.distributions.ZipfianGenerator;
import edu.brown.benchmark.ycsb.distributions.CustomSkewGenerator;
import edu.brown.logging.LoggerUtil;
import edu.brown.logging.LoggerUtil.LoggerBoolean;
import edu.brown.rand.RandomDistribution.FlatHistogram;
@@ -81,11 +82,11 @@ private Transaction(String displayName, int weight) {
} // TRANSCTION ENUM
private final long init_record_count;
// private final CustomSkewGenerator readRecord;
//private final CustomSkewGenerator readRecord;
private final ZipfianGenerator readRecord;
@SuppressWarnings("unused")
private final ZipfianGenerator insertRecord;
// private final CustomSkewGenerator insertRecord;
//private final CustomSkewGenerator insertRecord;
private final ZipfianGenerator randScan;
private final FlatHistogram<Transaction> txnWeights;
private final Random rand_gen;
@@ -171,7 +172,6 @@ public void runLoop() {
}
}
catch (IOException e) {
}
}
@@ -31,7 +31,7 @@
public abstract class YCSBConstants {
public static final int NUM_RECORDS = 1000000; // Note: this should match value in YCSB.properties
public static final int NUM_RECORDS = 10000; // Note: this should match value in YCSB.properties
public static final double ZIPFIAN_CONSTANT = 0.5;
Oops, something went wrong.

0 comments on commit 995f716

Please sign in to comment.