Skip to content
This repository has been archived by the owner on Dec 5, 2018. It is now read-only.

Updated the tsunami test #59

Merged
merged 1 commit into from
Nov 30, 2015
Merged

Updated the tsunami test #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ The test will automatically create the necessary tables if it doesn't find them.

In one console, run the gondola agent command. This process listens for commands to start and stop a gondola instance.
```
> ./bin/gondola-agent.sh
> ./bin/gondola-agent
2015-09-27 10:07:58,638 INFO Initialize system, kill all gondola processes
2015-09-27 10:07:59,973 INFO Listening on port 1200
...
```

In another console, run the tsunami test:
```
> ./bin/tsunami.sh
> ./bin/tsunami
Dropping all tables
2015-09-27 10:20:00,879 INFO Connecting to gondola agent at localhost:1200
2015-09-27 10:20:00,881 INFO Connecting to gondola agent at localhost:1200
Expand Down
6 changes: 3 additions & 3 deletions core/bin/gondola
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ if [ -z "$JAVA_OPTS" ]; then
export xJAVA_OPTS="-ea -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"
fi

# Error if hostid is not specified
# Error if host is not specified
function check_hostid {
if [ -z "$HOSTID" ]; then
echo "-hostid is missing"
echo "-host is missing"
sh $GONDOLA_CMD $PARAMS
exit 1
fi
Expand All @@ -27,7 +27,7 @@ function check_hostid {
# Find the hostid. To be used for the pid file.
while test $# -gt 0; do
case "$1" in
-hostid)
-host)
shift
if test $# -gt 0; then
export HOSTID=$1
Expand Down
0 core/bin/gondola-agent.sh → core/bin/gondola-agent
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions core/bin/gondola-local-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

function start {
rm -rf /tmp/gondola*
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder" nohup bin/gondola.sh -hostid host1 -clusterid cluster1 -workers 10 -conf conf/gondola-sample.conf &
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder" nohup bin/gondola.sh -hostid host2 -clusterid cluster1 -workers 10 -conf conf/gondola-sample.conf &
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5007 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder" nohup bin/gondola.sh -hostid host3 -clusterid cluster1 -workers 10 -conf conf/gondola-sample.conf &
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder" nohup bin/gondola -hostid host1 -clusterid cluster1 -workers 10 -conf conf/gondola-sample.conf &
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder" nohup bin/gondola -hostid host2 -clusterid cluster1 -workers 10 -conf conf/gondola-sample.conf &
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5007 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder" nohup bin/gondola -hostid host3 -clusterid cluster1 -workers 10 -conf conf/gondola-sample.conf &
}

function stop {
Expand Down
6 changes: 3 additions & 3 deletions core/bin/gondola-remote.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ PATH=/usr/bin:/usr/local/bin:/home/y/bin:/home/y/sbin:/home/y/bin64:/home/y/sbin

function start {
rm -rf /tmp/gondola*
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" nohup bin/gondola.sh -hostid host1 -clusterid cluster1 -port 1099 -config conf/gondola-remote.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006" nohup bin/gondola.sh -hostid host2 -clusterid cluster1 -port 1100 -config conf/gondola-remote.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5007" nohup bin/gondola.sh -hostid host3 -clusterid cluster1 -port 1101 -config conf/gondola-remote.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" nohup bin/gondola -hostid host1 -clusterid cluster1 -port 1099 -config conf/gondola-remote.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006" nohup bin/gondola -hostid host2 -clusterid cluster1 -port 1100 -config conf/gondola-remote.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5007" nohup bin/gondola -hostid host3 -clusterid cluster1 -port 1101 -config conf/gondola-remote.conf start 2>&1
}

function stop {
Expand Down
6 changes: 3 additions & 3 deletions core/bin/gondola-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

function start {
rm -rf /tmp/gondola*
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" nohup bin/gondola.sh -hostid host1 -clusterid cluster1 -port 1099 -conf conf/gondola-sample.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" nohup bin/gondola -hostid host1 -clusterid cluster1 -port 1099 -conf conf/gondola-sample.conf start 2>&1
sleep 1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006" nohup bin/gondola.sh -hostid host2 -clusterid cluster1 -port 1100 -conf conf/gondola-sample.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5007" nohup bin/gondola.sh -hostid host3 -clusterid cluster1 -port 1101 -conf conf/gondola-sample.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006" nohup bin/gondola -hostid host2 -clusterid cluster1 -port 1100 -conf conf/gondola-sample.conf start 2>&1
env JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5007" nohup bin/gondola -hostid host3 -clusterid cluster1 -port 1101 -conf conf/gondola-sample.conf start 2>&1
echo "Wait for server up and send force leader signal.."
sleep 1
echo "F" | nc localhost 1099
Expand Down
0 core/bin/tsunami.sh → core/bin/tsunami
View file
Open in desktop
File renamed without changes.
49 changes: 36 additions & 13 deletions core/conf/gondola-command.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,44 @@

gondola {
hosts = [
{ hostId = "H1", hostname = "127.0.0.1", port = "2828" }
{ hostId = "H2", hostname = "127.0.0.1", port = "2829" }
{ hostId = "H3", hostname = "127.0.0.1", port = "2830" }
{ hostId = "H4", hostname = "127.0.0.1", port = "2831" }
{ hostId = "H5", hostname = "127.0.0.1", port = "2832" }
{ hostId = "H6", hostname = "127.0.0.1", port = "2833" }
{ hostId = H1, hostname = "127.0.0.1", port = "2828", storeId = DB1 }
{ hostId = H2, hostname = "127.0.0.1", port = "2829", storeId = DB2 }
{ hostId = H3, hostname = "127.0.0.1", port = "2830", storeId = DB3 }
{ hostId = H4, hostname = "127.0.0.1", port = "2831", storeId = DB1 }
{ hostId = H5, hostname = "127.0.0.1", port = "2832", storeId = DB2 }
{ hostId = H6, hostname = "127.0.0.1", port = "2833", storeId = DB3 }
]
shards = [
{ shardId = "S1", hosts =
[
{hostId: H1, memberId: 81}
{hostId: H2, memberId: 82}
{hostId: H3, memberId: 83}
{ hostId: H1, memberId: 81 }
{ hostId: H2, memberId: 82 }
{ hostId: H3, memberId: 83 }
]
}
{ shardId = "S2", hosts =
[
{hostId: H4, memberId: 84}
{hostId: H5, memberId: 85}
{hostId: H6, memberId: 86}
{ hostId: H4, memberId: 84 }
{ hostId: H5, memberId: 85 }
{ hostId: H6, memberId: 86 }
]
}
]
stores = [
{ storeId = DB1, h2.url = "jdbc:h2:/tmp/gondola-db1" }
{ storeId = DB2, h2.url = "jdbc:h2:/tmp/gondola-db2" }
]
sites = [
{ siteId = DC1, hosts =
[ H1, H4 ]
}
{ siteId = DC2, hosts =
[ H2, H5 ]
}
{ siteId = DC3, hosts =
[ H3, H6 ]
}
]
}

##################### raft
Expand Down Expand Up @@ -58,7 +73,7 @@ gondola {
tracing {
summary_period = 30000
raft_messages = false
raft_heartbeats = true
raft_heartbeats = false
command = false
storage = false
network = false
Expand All @@ -70,6 +85,14 @@ gondola {

storage {
impl = storage.h2

h2 {
class = com.yahoo.gondola.impl.H2dbStorage
url = "jdbc:h2:/tmp/gondola-db-$hostId"
user = sa
password = ""
port = 9092
}
}

##################### gondola command
Expand Down
2 changes: 1 addition & 1 deletion core/conf/gondola-tsunami.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ gondola {
tracing {
summary_period = 30000
raft_messages = true
raft_heartbeats = true
raft_heartbeats = false
command = true
storage = true
network = false
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.3.8</version>
<version>2.4.2</version>
</dependency>
<!-- Dependency used in command line tools -->
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/com/yahoo/gondola/impl/MySqlStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ public class MySqlStorage implements Storage {
public MySqlStorage(Gondola gondola, String hostId) throws GondolaException {
// Get configs
maxCommandSize = gondola.getConfig().getInt("raft.command_max_size");
String user = gondola.getConfig().get("storage_mysql.user");
String password = gondola.getConfig().get("storage_mysql.password");
String url = gondola.getConfig().get("storage_mysql.url");
String user = gondola.getConfig().get("storage.mysql.user");
String password = gondola.getConfig().get("storage.mysql.password");
String url = gondola.getConfig().get("storage.mysql.url");
url = url.replace("$hostId", hostId);

logger.info("Initializing MySql storage. maxCommandSize={} url={}", maxCommandSize, url);
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/yahoo/gondola/impl/NastyStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ public class NastyStorage implements Storage {
boolean enabled;

public NastyStorage(Gondola gondola, String hostId) throws GondolaException {
String storageClassName = gondola.getConfig().get(gondola.getConfig().get("storage_nasty.impl") + ".class");
String storageClassName = gondola.getConfig().get(gondola.getConfig().get("storage.nasty.impl") + ".class");
try {
storage = (Storage) Class.forName(storageClassName).getConstructor(Gondola.class, String.class)
.newInstance(gondola, hostId);
} catch (Exception e) {
throw new GondolaException(e);
}
tracing = gondola.getConfig().getBoolean("storage_nasty.tracing");
tracing = gondola.getConfig().getBoolean("storage.nasty.tracing");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ gondola {
# (e.g. connect retry failed), only the message is displayed and the stack trace is suppressed.
# Also when suppression is enabled, some known and noisy exceptions are only printed once a minute,
# along with the number of times the message was suppressed within the minute.
stack_trace_suppression = false
stack_trace_suppression = true

tracing {
# Gondola prints out details of it's internal queues and pools at the specified period (ms)
Expand Down
10 changes: 4 additions & 6 deletions core/src/test/java/com/yahoo/gondola/cli/GondolaAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class GondolaAgent {

static Logger logger = LoggerFactory.getLogger(GondolaAgent.class);

static String configFile;
static String configFile = "conf/gondola-command.conf";
static int port;
static Config config;
AtomicInteger jdwpPort = new AtomicInteger(5005);
Expand Down Expand Up @@ -73,8 +73,6 @@ public static void main(String[] args) throws ParseException, IOException {
}
if (commandLine.hasOption("config")) {
configFile = commandLine.getOptionValue("config");
} else {
configFile = "conf/gondola-sample.conf";
}

config = new Config(new File(configFile));
Expand Down Expand Up @@ -124,7 +122,7 @@ public void run() {
String[] split = line.split(" ");
logger.info("Received command: {}", line);
switch (split[0]) {
// create <param1> <param2> ... -> gondola.sh <param1> <param2> ....
// create <param1> <param2> ... -> gondola <param1> <param2> ....
case "create":
if (split.length >= 2) {
execGondola(split[1], line.substring(line.indexOf(split[1]) + split[1].length()));
Expand Down Expand Up @@ -221,7 +219,7 @@ private boolean killGondola(String hostId) {
}

private void execGondola(String hostId, String args) throws IOException {
args = "./bin/gondola.sh " + args;
args = "./bin/gondola " + args;
logger.info("Launching gondola: {}", args);

ProcessBuilder pb = new ProcessBuilder(args.split("\\s"));
Expand All @@ -232,7 +230,7 @@ private void execGondola(String hostId, String args) throws IOException {
getJdwpPort(hostId)));

// Redirect output to a log file
File outFile = new File(String.format("logs/gondola-%s.log", hostId));
File outFile = new File(String.format("logs/tsunami-%s.log", hostId));
pb.redirectOutput(outFile);
pb.redirectError(outFile);

Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/com/yahoo/gondola/tsunami/AgentClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public AgentClient(String hostId, String hostname, int agentPort, CliClient gond

public void createInstance() {
try {
channel.send(String.format("create %s -hostid %s -clusterid cluster1 -port %d -config %s start",
channel.send(String.format("create %s -host %s -shard shard1 -port %d -config %s start",
hostId, hostId, gondolaCc.getPort(), "conf/gondola-tsunami.conf"));
up = true;
} catch (Exception e) {
Expand Down