src/osp_file.erl gen-join.pl @@ -20,6 +20,10 @@ proto() -> PROTO. +%% @doc Opens a file for reading or writing +fopen(Filename, Flags) -> + osp_file:fopen(MOD, Filename, Flags). + %% @doc Stores a value in the mnesia database store(Key, Val) -> osp_mnesia:store(MOD_table, Key, Val). header.erl @@ -1,10 +1,11 @@ + % OSP Server Configuration % Use FQDNs -define(USEFQDN, false). % The name of this node (if the above is true, this must be a FQDN) --define(NODENAME, 'master'). +-define(NODENAME, 'master@localhost'). % Port the admin console should listen on -define(ADMINPORT, 9876). @@ -17,3 +18,9 @@ % Allowed diskless client IPs -define(ALLOWED_DISKLESS, ['127.0.0.1']). + +% Whether the application filesystem is just on the master node, or shared (like NFS) +-define(SHARED_FS, false). + +% The prefix of the application file area +-define(FS_PREFIX, "/tmp"). include/conf.hrl @@ -1,4 +1,5 @@ #!/bin/bash echo "Setting up OSP" +epmd -daemon erl -smp auto -pa ./ebin -detached -run osp setup setup-osp.sh @@ -44,7 +44,8 @@ handlecommand(Sock, Msg) -> F = fun(Node) -> sendf(Sock, "~p: ~f~n", [Node, round(100 * rpc:call(Node, cpu_sup, avg1, []) / 256) / 100]) end, sendf(Sock, "Nodes in the cluster and their CPU Utilization: ~n", []), lists:map(F, [node() | nodes()]), - sendf(Sock, "The following IPs: ~p are allowed to be diskless~n", [erl_boot_server:which_slaves()]); + send(Sock, "The following IPs are allowed to be diskless:\r\n"), + send(Sock, get_ok_slaves()); "quit" -> close(Sock), exit(normal); @@ -111,6 +112,7 @@ handlecommand(Sock, Msg) -> end end. +%% @todo This needs to update on every start of a new application bkup_db(Node, Type) -> Tables = mnesia:system_info(tables), F = fun(TableName) -> @@ -139,6 +141,15 @@ start_db(Node, App) -> rpc:call(Node, mnesia, wait_for_tables, [[TableName], 1000]), ok. +ip_to_string({A, B, C, D}) -> + erlang:integer_to_list(A) ++ "." ++ erlang:integer_to_list(B) ++ "." ++ erlang:integer_to_list(C) ++ "." ++ erlang:integer_to_list(D). + +get_ok_slaves() -> + Slaves = erl_boot_server:which_slaves(), + Fun = fun({NM, IP}, A) -> + A ++ "\tIP: " ++ ip_to_string(IP) ++ " Netmask: " ++ ip_to_string(NM) ++ "\r\n" + end, + lists:foldl(Fun, [], Slaves). stop_servlet(App, Node, Sock) -> case lists:member(Node, [node() | nodes()]) of src/osp_admin.erl start-osp.sh 1635b7a05f5138823728ccd47bc1504bda53b956 Jacob I. Torrey torreyji@clarkson.edu http://github.com/ranok/open-server-platform/commit/71b8931f76fec83d6bc5ee887626d2b6f31f4f82 71b8931f76fec83d6bc5ee887626d2b6f31f4f82 2009-04-15T16:01:21-07:00 2009-04-15T16:01:21-07:00 Added a file IO library and included it into the header, but have yet to test it. Also made the diskless IP printing much prettier and fixed a bug where epmd is not getting started all the time. e50ce1ce41d72e80ef79a1a49ab8b4278eb5c92d Jacob I. Torrey torreyji@clarkson.edu