Merge pull request #41 from goncalotomas/multi-fmk2

Implement scripts to start multiple replicas of FMKe

.gitignore

@@ -13,3 +13,7 @@ erl_crash.dump
 .rebar
 logs
 _build
+deps/
+TEST-*
+rebar3.crashdump
+tests/

Makefile

@@ -13,8 +13,8 @@ compile:
 	mv ${CLIENT}.beam ${EBIN}/
 
 rel:
-	rm -rf _build/default/rel/fmk/
-	${REBAR} release
+	rm -rf _build/default/rel/
+	${REBAR} release -n fmk
 
 relclean:
 	rm -rf _build/default/rel
@@ -24,4 +24,4 @@ bench: compile
 	-Rscript --vanilla ${BENCH}/priv/summary.r -i tests/current
 
 console: rel
-	./_build/default/rel/fmk/bin/fmk console
+	./_build/default/rel/fmk/bin/env console

bin/all.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export RELX_REPLACE_OS_VARS=true
+i=$1
+   echo "stopping FMKe instances..."
+   ./bin/stop-nodes.sh ${i}
+      echo "cleanning old FMKe releases and building new ones..."
+   ./bin/build-releases.sh ${i}
+   echo "launching FMKe releases..."
+   ./bin/launch-nodes.sh ${i}
+

bin/build-releases.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+export RELX_REPLACE_OS_VARS=true
+make relclean
+for i in `seq 1 $1`;
+do
+   ./rebar3 release -n fmk${i}
+done

bin/env

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# HTTP port.
+if [ -z "$HTTP_PORT" ]; then
+  export HTTP_PORT=9090
+fi
+
+# HTTP IP address.
+if [ -z "$IP" ]; then
+  export IP="127.0.0.1"
+fi
+
+# Antidote instance port.
+if [ -z "$ANTIDOTE_PB_PORT" ]; then
+  export ANTIDOTE_PB_PORT=8087
+fi
+
+# Antidote instance IP address.
+if [ -z "$ANTIDOTE_ADDRESS" ]; then
+  export ANTIDOTE_ADDRESS="127.0.0.1"
+fi
+
+# Receive the host name from the parameters
+if [ -z "$INSTANCE_NAME" ]; then
+    export INSTANCE_NAME=fmk
+fi
+
+  # Choose the hostname for the epmd long name if the hostname exists
+  # and if it resolves through the resolver; using a resolvable name
+  # that's only resolvable with resolv.conf won't work for long names.
+  if [ ! -z "$HOSTNAME" ]; then
+    if /usr/bin/dig ${HOSTNAME} | grep -q 'NXDOMAIN'
+      export NODE_NAME=${INSTANCE_NAME}@${HOSTNAME}
+    then
+      export NODE_NAME=${INSTANCE_NAME}@${IP}
+    fi
+  fi
+  # Else, default to IP.
+  if [ -z "$NODE_NAME" ]; then
+    export NODE_NAME=${INSTANCE_NAME}@${IP}
+  fi
+#
+#  # Handoff port.
+#  export HANDOFF_PORT=${PORT1}
+#
+#  # Protocol buffer port.
+#  export PB_PORT=${PORT2}
+#
+#  # Pub/sub port.
+#  export PUBSUB_PORT=${PORT3}
+#
+#  # Logeader port.
+#  export LOGREADER_PORT=${PORT4}
+#fi
+
+# Assume 127.0.0.1 as bind host.
+if [ -z "$IP" ]; then
+  echo "IP address not set; defaulting to 127.0.0.1."
+  export IP=127.0.0.1
+fi
+
+if [ -z "$NODE_NAME" ]; then
+  export NODE_NAME=${INSTANCE_NAME}@${IP}
+fi
+
+if [ -z "$COOKIE" ]; then
+  export COOKIE=antidote
+fi
+
+export RELX_REPLACE_OS_VARS=true
+
+echo "PORT0: ${PORT0}"
+echo "PORT1: ${PORT1}"
+echo "PORT2: ${PORT2}"
+echo "PORT3: ${PORT3}"
+echo "PORT4: ${PORT4}"
+
+
+echo "NODE_NAME: ${NODE_NAME}"
+echo "COOKIE: ${COOKIE}"
+echo "IP: ${IP}"
+echo "IP: ${IP}"
+echo "HTTP_PORT: ${HTTP_PORT}"
+
+RELNAME="`dirname \"$0\"`"/${INSTANCE_NAME}
+exec ${RELNAME} "$@"

bin/launch-nodes.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export RELX_REPLACE_OS_VARS=true
+for i in `seq 1 $1`;
+do
+  HTTP_PORT=9${i}90 INSTANCE_NAME=fmk${i} ANTIDOTE_PB_PORT=8${i}87 COOKIE=antidote _build/default/rel/fmk${i}/bin/env foreground &
+done

bin/stop-nodes.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export RELX_REPLACE_OS_VARS=true
+for i in `seq 1 $1`;
+do
+  _build/default/rel/fmk${i}/bin/fmk${i} stop
+done

config/vars.config

@@ -0,0 +1,5 @@
+%%
+%% etc/vm.args
+%%
+{node,                  "fmk@127.0.0.1"}.
+{cookie,                "antidote"}.

config/vm.args

@@ -1,8 +1,8 @@
 ## Name of the node
--name fmk@127.0.0.1
+-name ${NODE_NAME}
 
 ## Cookie for distributed erlang
--setcookie antidote
+-setcookie ${COOKIE}
 
 ## Directories with compiled modules
 -pa ./_build/default/lib/*/ebin

include/fmk.hrl

@@ -1,6 +1,7 @@
--define(ANTIDOTE, 'antidote@127.0.0.1').
+%%-define(ANTIDOTE, 'antidote@127.0.0.1').
 -define(DEFAULT_ANTIDOTE_PORT, 8087).
 -define(DEFAULT_ANTIDOTE_ADDRESS, "127.0.0.1").
+-define (DEFAULT_FMKE_HTTP_PORT, 9090).
 -define (APP, fmke).
 -define (VAR_ANTIDOTE_PB_PID, antidote_pb_pid).
 -define (VAR_ANTIDOTE_PB_ADDRESS, antidote_pb_address).

rebar.config

@@ -11,13 +11,23 @@
     {antidote_pb, {git, "https://github.com/SyncFree/antidote_pb", {tag, "erlang19"}}},
     {mochiweb, {git, "https://github.com/mochi/mochiweb", {tag, "master"}}},
     {poolboy, {git, "https://github.com/devinus/poolboy", {tag, "1.5.1"}}},
-    {cowboy, {git, "https://github.com/ninenines/cowboy", {tag, "master"}}}
+    {cowboy, {git, "https://github.com/ninenines/cowboy", {tag, "master"}}},
+    {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "v2.8.0"}}}
   ]}.
 
-{relx, [{release, {fmk, "0.0.1"},
-         [fmk]},
+{relx, [
+    {release, {fmk, "0.0.1"}, [fmk]},
+    {release, {fmk1, "0.0.1"}, [fmk]},
+    {release, {fmk2, "0.0.1"}, [fmk]},
+    {release, {fmk3, "0.0.1"}, [fmk]},
+    {release, {fmk4, "0.0.1"}, [fmk]},
+    {release, {fmk5, "0.0.1"}, [fmk]},
          {vm_args, "config/vm.args"},
         {dev_mode, true},
         {include_erts, false},
 
+    {overlay, [
+        {copy, "bin/env", "bin"}]},
+
+        {overlay_vars, "config/vars.config"},
         {extended_start_script, true}]}.

runBenchLocal.sh

@@ -59,7 +59,7 @@ make all
 
 # Start FMK:
 echo "Starting FMK"
-_build/default/rel/fmk/bin/fmk start
+_build/default/rel/fmk/bin/env start
 
 # wait for FMK to start (TODO better way?)
 echo "Waiting for FMK to start"
@@ -76,7 +76,7 @@ echo "Benchmark done"
 
 # Stop FMK
 echo "Stopping FMK"
-_build/default/rel/fmk/bin/fmk stop
+_build/default/rel/fmk/bin/env stop
 
 if [ -n "$ANTIDOTE_FOLDER" ]; then
     # Stop Antidote

src/antidote_pool.erl

@@ -39,16 +39,16 @@ with_connection(Fun) ->
 %%% Supervisor callbacks
 %%%===================================================================
 
-init(Options) ->
-  Hostname = proplists:get_value(hostname, Options, "localhost"),
-  Port = proplists:get_value(port, Options, 8087),
+init(_Options) ->
+  AntidotePort = list_to_integer(fmk_config:get(antidote_port, "8087")),
+  AntidoteAddress = fmk_config:get(antidote_address,'127.0.0.1'),
   PoolArgs = [
     {name, {local, antidote_connection_pool}},
     {worker_module, ?MODULE},
     {size, 15},
     {max_overflow, 0}
   ],
-  WorkerArgs = [Hostname, Port],
+  WorkerArgs = [AntidoteAddress, AntidotePort],
   PoolSpec = poolboy:child_spec(antidote_connection_pool, PoolArgs, WorkerArgs),
   {ok, {{one_for_one, 10, 10}, [PoolSpec]}}.
 

src/fmk.app.src

@@ -13,9 +13,10 @@
     antidote_pb,
     riak_pb,
     poolboy,
-    cowboy
+    cowboy,
+    jsx
    ]},
-  {env,[]},
+
   {modules, []},
 
   {maintainers, []},

src/fmk_app.erl

@@ -15,29 +15,31 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    Dispatch = cowboy_router:compile([
-  		{'_', [
-  			{"/prescriptions/[:id]", prescription_handler, []},
-        {"/patients/[:id]", patient_handler, []},
-        {"/pharmacies/[:id]", pharmacy_handler, []},
-        {"/facilities/[:id]", facility_handler, []},
-        {"/treatments/[:id]", treatment_handler, []},
-        {"/events/[:id]", event_handler, []},
-        {"/staff/[:id]", staff_handler, []}
-  		]}
-  	]),
-  	{ok, _} = cowboy:start_clear(http, 100, [{port, 9090}], #{
-  		env => #{dispatch => Dispatch}
-  	}),
-    case fmk_sup:start_link() of
+    Result = case fmk_sup:start_link() of
         {ok, Pid} ->
               case open_antidote_socket() of
                 ok -> {ok, Pid};
                 _ -> {error, cannot_open_protobuff_socket}
               end;
         {error, Reason} ->
               {error, Reason}
-    end.
+    end,
+    Dispatch = cowboy_router:compile([
+      {'_', [
+        {"/prescriptions/[:id]", prescription_handler, []},
+        {"/patients/[:id]", patient_handler, []},
+        {"/pharmacies/[:id]", pharmacy_handler, []},
+        {"/facilities/[:id]", facility_handler, []},
+        {"/treatments/[:id]", treatment_handler, []},
+        {"/events/[:id]", event_handler, []},
+        {"/staff/[:id]", staff_handler, []}
+      ]}
+    ]),
+    HttpPort = list_to_integer(fmk_config:get(http_port,9090)),
+    {ok, _} = cowboy:start_clear(http, 100, [{port, HttpPort}], #{
+      env => #{dispatch => Dispatch}
+    }),
+    Result.
 
 %%--------------------------------------------------------------------
 stop(_State) ->
@@ -55,8 +57,9 @@ set_application_variable(ApplicationVariable, EnvironmentVariable, EnvironmentDe
   Value.
 
 open_antidote_socket() ->
+    set_application_variable(http_port,"HTTP_PORT",?DEFAULT_FMKE_HTTP_PORT),
     set_application_variable(antidote_address,"ANTIDOTE_ADDRESS",?DEFAULT_ANTIDOTE_ADDRESS),
-    set_application_variable(antidote_port,"ANTIDOTE_PORT",?DEFAULT_ANTIDOTE_PORT),
+    set_application_variable(antidote_port,"ANTIDOTE_PB_PORT",?DEFAULT_ANTIDOTE_PORT),
     AntidoteNodeAddress = fmk_config:get_env(?VAR_ANTIDOTE_PB_ADDRESS,?DEFAULT_ANTIDOTE_ADDRESS),
     AntidoteNodePort = fmk_config:get_env(?VAR_ANTIDOTE_PB_PORT,?DEFAULT_ANTIDOTE_PORT),
     {ok, _} =antidote_pool:start([{hostname, AntidoteNodeAddress}, {port, AntidoteNodePort}]),

src/patient_handler.erl

@@ -25,11 +25,16 @@ handle_req(<<"GET">>, false, Req) ->
 		get_patient(Req).
 
 create_patient(Req) ->
-		{ok, [{<<"id">>, Id},
-		{<<"name">>, Name},
-		{<<"address">>, Address}
-		], _Req0} = cowboy_req:read_urlencoded_body(Req),
-		IntegerId = binary_to_integer(Id),
+		{ok, Data, _Req2} = cowboy_req:read_body(Req),
+		Json = jsx:decode(Data),
+		Id = proplists:get_value(<<"id">>, Json),
+		Name = proplists:get_value(<<"name">>, Json),
+		Address = proplists:get_value(<<"address">>, Json),
+		IntegerId = 
+			if
+				is_binary(Id) -> list_to_integer(binary_to_list(Id));
+				true -> Id
+			end,
 		case IntegerId =< ?MIN_ID of
 				true ->
 						cowboy_req:reply(400, [], ?ERR_INVALID_PATIENT_ID, Req);

test/basho_bench_driver_fmkclient.erl

@@ -223,5 +223,6 @@ run(get_prescription, _GeneratedKey, _GeneratedValue, State) ->
     Error -> {error, Error, State}
   end.
 
+
 run_op(FmkNode,Op,Params) ->
   rpc:call(FmkNode,fmk_core,Op,Params).

test/example.json

@@ -0,0 +1,29 @@
+[{"test" : {"id" : "FMKeTest",
+            "phases" : ["Phase1"],
+            "plugins" : ["LocalFMKeNode"]
+           }},
+
+ {"plugin" : {"id" : "LocalFMKeNode",
+              "plugin_info" : {"http-plugin" : {"servers" : [{"host" : "localhost",
+                                                              "port" : 9090,
+                                                              "ssl" : false}
+                                                            ],
+                                                "stats_per_url" : true
+                                               }}
+             }},
+
+ {"phase" : {"id" : "Phase1",
+             "arrival_rate" : 10,
+             "duration" : 60,
+             "concurrent_scenarios" : 250,
+             "rate" : 500,
+             "scenarios" : [{"Scenario1" : 1}]}},
+
+ {"scenario" : {"id" : "Scenario1",
+                "keepalive" : true,
+                "actions" : [ {"http-request" : {"plugin_id" : "LocalFMKeNode",
+                                                 "method" : "GET",
+                                                 "path" : "/patients/1"
+                                                }
+                              }]}}
+]