Commit ccfd6a47 authored by gerd's avatar gerd

build fixed after renames


git-svn-id: https://gps.dynxs.de/private/svn/app-plasma/trunk@225 55289a75-7b90-4627-9e07-ffb4263930b2
parent d68fe43a
......@@ -103,6 +103,7 @@ documentation for release:
demo C client
management scripts
ip addr show label "eth*" | grep link/ether | awk '{print $2}'
Optimizations:
......
......@@ -122,8 +122,18 @@ if $(not $(defined OCAMLRPCGEN))
# If so, define the subdirectory targets and uncomment this section.
#
.SUBDIRS: postgresql bitv platform plasmasupport pfs_support datanode namenode clients servers \
plasmaclient adminclients nfs3 mapred
.SUBDIRS: \
postgresql \
bitv \
mr_platform \
plasmasupport \
pfs_support \
pfs_datanode \
pfs_namenode \
pfs_admin \
plasmaclient \
pfs_nfs3 \
mr_framework
################################################
# Generated files
......
......@@ -13,7 +13,7 @@ open Mapred_tasks
open Mapred_def
open Printf
module Mr_proxy = Mapred_rpc_clnt.Make'Mapred(Rpc_proxy.ManagedClient)
module Mr_proxy = Mapred_rpc_clnt.Make'Mapred_task(Rpc_proxy.ManagedClient)
type runtime_job_config =
......@@ -77,7 +77,7 @@ let misalloc_penalty = 4.0
let new_client job saddr =
let mclient_config =
Rpc_proxy.ManagedClient.create_mclient_config
~programs:[ Mapred_rpc_clnt.Mapred.V1._program ]
~programs:[ Mapred_rpc_clnt.Mapred_task.V1._program ]
~initial_ping:true
() in
(* TODO: no timeout so far - this is not possible with current RPC API *)
......
#include "pmr_task.x"
......@@ -116,7 +116,7 @@ let proc_configure (low,high) =
let setup srv (mj,conf,cf) =
Mapred_rpc_srv.Mapred.V1.bind
Mapred_rpc_srv.Mapred_task.V1.bind
~proc_null:(fun () -> ())
~proc_exec:(proc_exec (mj,conf,cf))
~proc_kill
......
......@@ -2,10 +2,10 @@ platform_c.o: platform_c.c
$(OCAMLC) -c platform_c.c
mr_platform.cma: platform.cmo platform_c.o
ocamlmklib -o platform platform.cmo platform_c.o
ocamlmklib -o mr_platform platform.cmo platform_c.o
mr_platform.cmxa platform.a: platform.cmx platform_c.o
ocamlmklib -o platform platform.cmx platform_c.o
mr_platform.cmxa mr_platform.a: platform.cmx platform_c.o
ocamlmklib -o mr_platform platform.cmx platform_c.o
if $(BYTE_ENABLED)
.DEFAULT: mr_platform.cma
......
......@@ -21,7 +21,7 @@ let with_dn_admin namenode f =
(Plasma_util.sockaddr_of_host_port
(Plasma_util.parse_host_port namenode)) in
let client =
Plasma_rpcapi_clnt.Dn_admin.V1.create_client2
Pfs_rpcapi_clnt.Dn_admin.V1.create_client2
(`Socket(Rpc.Tcp, conn, Rpc_client.default_socket_config)) in
( try
let () = f client in
......@@ -55,7 +55,7 @@ let add_datanode() =
(fun client ->
List.iter
(fun id ->
Plasma_rpcapi_clnt.Dn_admin.V1.add_datanode client (id, !size)
Pfs_rpcapi_clnt.Dn_admin.V1.add_datanode client (id, !size)
)
!identities
)
......@@ -85,7 +85,7 @@ let enable_datanode() =
with_dn_admin !namenode
(fun client ->
Plasma_rpcapi_clnt.Dn_admin.V1.enable_datanode client (!identity, !datanode)
Pfs_rpcapi_clnt.Dn_admin.V1.enable_datanode client (!identity, !datanode)
)
......@@ -109,7 +109,7 @@ let disable_datanode() =
with_dn_admin !namenode
(fun client ->
Plasma_rpcapi_clnt.Dn_admin.V1.disable_datanode client !identity
Pfs_rpcapi_clnt.Dn_admin.V1.disable_datanode client !identity
)
......@@ -126,13 +126,13 @@ let list_datanodes() =
with_dn_admin !namenode
(fun client ->
let identities =
Plasma_rpcapi_clnt.Dn_admin.V1.datanodes client () in
Pfs_rpcapi_clnt.Dn_admin.V1.datanodes client () in
Array.iter
(fun id ->
let enabled =
Plasma_rpcapi_clnt.Dn_admin.V1.is_enabled client id in
Pfs_rpcapi_clnt.Dn_admin.V1.is_enabled client id in
let hostport =
Plasma_rpcapi_clnt.Dn_admin.V1.lookup client id in
Pfs_rpcapi_clnt.Dn_admin.V1.lookup client id in
printf "%-32s %-10s %s\n"
id
(if enabled then "enabled" else "disabled")
......@@ -166,7 +166,7 @@ let destroy_datanode() =
with_dn_admin !namenode
(fun client ->
Plasma_rpcapi_clnt.Dn_admin.V1.destroy_datanode client !identity
Pfs_rpcapi_clnt.Dn_admin.V1.destroy_datanode client !identity
)
let sync e =
......@@ -193,8 +193,8 @@ let fsck() =
Netlog.current_logger := Netlog.channel_logger stderr `Info;
let cf = Netplex_config.read_config_file !conf in
let db_conf = Plasma_db.extract_db_config cf in
let db = (new Plasma_db.connect db_conf : Plasma_db.ro_async_connection) in
let db_conf = Pfs_db.extract_db_config cf in
let db = (new Pfs_db.connect db_conf : Pfs_db.ro_async_connection) in
printf "Checking blockmap\n%!";
......
......@@ -6,11 +6,11 @@
should be started.
*)
module Rpcapi_clnt = Plasma_rpcapi_clnt
module Rpcapi_srv = Plasma_rpcapi_srv
module Rpcapi_aux = Plasma_rpcapi_aux
module Rpcapi_clnt = Pfs_rpcapi_clnt
module Rpcapi_srv = Pfs_rpcapi_srv
module Rpcapi_aux = Pfs_rpcapi_aux
module Dn = Plasma_rpcapi_clnt.Make'Datanode(Rpc_proxy.ManagedClient)
module Dn = Pfs_rpcapi_clnt.Make'Datanode(Rpc_proxy.ManagedClient)
module Dn_store_var =
Netplex_cenv.Make_var_type(struct type t = Dn_store.dn_store end)
......@@ -120,7 +120,7 @@ let create_dn_client conn =
let esys = Unixqueue.create_unix_event_system() in
let mclient_config =
Rpc_proxy.ManagedClient.create_mclient_config
~programs:[ Plasma_rpcapi_clnt.Datanode.V1._program ]
~programs:[ Pfs_rpcapi_clnt.Datanode.V1._program ]
~msg_timeout:(300.0)
~msg_timeout_is_fatal:true
~initial_ping:true
......
......@@ -17,9 +17,9 @@
open Printf
module Rpcapi_clnt = Plasma_rpcapi_clnt
module Rpcapi_srv = Plasma_rpcapi_srv
module Rpcapi_aux = Plasma_rpcapi_aux
module Rpcapi_clnt = Pfs_rpcapi_clnt
module Rpcapi_srv = Pfs_rpcapi_srv
module Rpcapi_aux = Pfs_rpcapi_aux
module Dio_proxy = Rpcapi_clnt.Make'Datanode_io(Rpc_proxy.ManagedClient)
......
......@@ -86,7 +86,7 @@ class blockmap : id:int -> identity:string -> size:int64 -> blockmap_t
*)
val blockmap_from_db_e : id:int -> identity:string -> size:int64 ->
Plasma_db.ro_async_connection ->
Pfs_db.ro_async_connection ->
Unixqueue.event_system ->
blockmap_t Uq_engines.engine
(** Create a blockmap object, and initialize it from the [blockalloc]
......
......@@ -10,10 +10,10 @@
open Printf
open Plasma_util.Operators
module Rpcapi_clnt = Plasma_rpcapi_clnt
module Rpcapi_srv = Plasma_rpcapi_srv
module Rpcapi_aux = Plasma_rpcapi_aux
module A = Plasma_rpcapi_aux
module Rpcapi_clnt = Pfs_rpcapi_clnt
module Rpcapi_srv = Pfs_rpcapi_srv
module Rpcapi_aux = Pfs_rpcapi_aux
module A = Pfs_rpcapi_aux
module Node_config_var =
Netplex_cenv.Make_var_type(struct type t = Nn_config.nn_node_config end)
......@@ -694,7 +694,7 @@ let fs_onclose srv cid =
*)
let fixup_ii ii =
let module A = Plasma_rpcapi_aux in
let module A = Pfs_rpcapi_aux in
let sh = get_shared() in
if ii.A.mtime.A.tnsecs < 0 || ii.A.mtime.A.tnsecs >= 1_000_000_000 then
raise(Nn_state.Transaction_error `einval);
......@@ -713,7 +713,7 @@ let fixup_ii ii =
ii.A.replication <- sh#node_config#nn_replication
let proc_allocate_inode sess (tid,ii) emit =
let module A = Plasma_rpcapi_aux in
let module A = Pfs_rpcapi_aux in
with_transaction
"allocate_inode" sess emit tid
(fun trans ->
......@@ -946,7 +946,7 @@ let proc_get_fsstat sess _ emit =
(e ++
(fun () ->
let r =
{ Plasma_rpcapi_aux.total_blocks = !total;
{ Pfs_rpcapi_aux.total_blocks = !total;
used_blocks = !used;
trans_blocks = !trans;
......@@ -1034,7 +1034,7 @@ let proc_fs_lookup sess (tid,path,dir_inode) emit =
| None ->
eps_e (`Error (trans_error `enoient)) esys
| Some ii ->
if ii.Plasma_rpcapi_aux.filetype <> `ftype_directory then
if ii.Pfs_rpcapi_aux.filetype <> `ftype_directory then
eps_e (`Error (trans_error `efhier)) esys
else
eps_e (`Done ()) esys
......@@ -1182,7 +1182,7 @@ let proc_list_1_e trans inode name =
let rentries =
List.map
(fun (n,i) ->
{ Plasma_rpcapi_aux.entry_name = n;
{ Pfs_rpcapi_aux.entry_name = n;
entry_inode = i
}
)
......@@ -1210,7 +1210,7 @@ let proc_list sess (tid,inode) emit =
| None ->
eps_e (`Error(Nn_state.Transaction_error `enoient)) esys
| Some ii ->
let ft = ii.Plasma_rpcapi_aux.filetype in
let ft = ii.Pfs_rpcapi_aux.filetype in
match ft with
| `ftype_regular | `ftype_symlink ->
eps_e (`Error(Nn_state.Transaction_error `efhier)) esys
......
(* $Id$ *)
module Rpcapi_clnt = Plasma_rpcapi_clnt
module Rpcapi_srv = Plasma_rpcapi_srv
module Rpcapi_aux = Plasma_rpcapi_aux
module Rpcapi_clnt = Pfs_rpcapi_clnt
module Rpcapi_srv = Pfs_rpcapi_srv
module Rpcapi_aux = Pfs_rpcapi_aux
module Dnctrl_proxy = Rpcapi_clnt.Make'Datanode_ctrl(Rpc_proxy.ManagedClient)
......
......@@ -3,9 +3,9 @@
open Printf
open Nn_datastores
module Rpcapi_clnt = Plasma_rpcapi_clnt
module Rpcapi_srv = Plasma_rpcapi_srv
module Rpcapi_aux = Plasma_rpcapi_aux
module Rpcapi_clnt = Pfs_rpcapi_clnt
module Rpcapi_srv = Pfs_rpcapi_srv
module Rpcapi_aux = Pfs_rpcapi_aux
exception Unavailable
......
This diff is collapsed.
This diff is collapsed.
......@@ -3,7 +3,7 @@
open Plasma_util.Operators
open Printf
module Elect_proxy = Plasma_rpcapi_clnt.Make'Elect(Rpc_proxy.ManagedClient)
module Elect_proxy = Pfs_rpcapi_clnt.Make'Elect(Rpc_proxy.ManagedClient)
type role =
[ `Coordinator | `Slave | `Excluded | `Unknown ]
......@@ -107,7 +107,7 @@ let rec send_announcements_stream_e count conn announcement esys =
Rpc_proxy.ReliabilityCache.create_rcache rcache_config in
let mclient_config =
Rpc_proxy.ManagedClient.create_mclient_config
~programs:[ Plasma_rpcapi_clnt.Elect.V1._program ]
~programs:[ Pfs_rpcapi_clnt.Elect.V1._program ]
~msg_timeout:1.0
~msg_timeout_is_fatal:false
~initial_ping:false
......@@ -161,7 +161,7 @@ let rec send_announcements_stream_e count conn announcement esys =
let send_annocunements nn_config port esys =
(** port: namenode port of this server *)
let announcement =
{ Plasma_rpcapi_aux.ann_clustername = nn_config#nn_clustername;
{ Pfs_rpcapi_aux.ann_clustername = nn_config#nn_clustername;
ann_sender = sprintf "%s:%d" nn_config#nn_hostname port;
ann_eligible = Array.of_list nn_config#nn_nodes;
ann_revision = get_revision();
......@@ -235,7 +235,7 @@ let send_annocunements nn_config port esys =
let set_coordinator_at nn_config rev port (h,p) esys =
let mclient_config =
Rpc_proxy.ManagedClient.create_mclient_config
~programs:[ Plasma_rpcapi_clnt.Elect.V1._program ]
~programs:[ Pfs_rpcapi_clnt.Elect.V1._program ]
~msg_timeout:60.0
~msg_timeout_is_fatal:true
~initial_ping:false
......@@ -306,9 +306,9 @@ let elect_e nn_config port esys =
let proc_announce nn_config ann =
let my_rev = get_revision() in
let my_rank = nn_config # nn_rank in
let ann_rev = ann.Plasma_rpcapi_aux.ann_revision in
let ann_rank = ann.Plasma_rpcapi_aux.ann_rank in
let ann_clustername = ann.Plasma_rpcapi_aux.ann_clustername in
let ann_rev = ann.Pfs_rpcapi_aux.ann_revision in
let ann_rank = ann.Pfs_rpcapi_aux.ann_rank in
let ann_clustername = ann.Pfs_rpcapi_aux.ann_clustername in
if !role = `Unknown && nn_config#nn_clustername = ann_clustername then
ann_rev > my_rev ||
......@@ -349,7 +349,7 @@ let proc_set_coordinator nn_config (coord_hp, cname, rev) =
let setup_elect_api srv nn_config =
Plasma_rpcapi_srv.Elect.V1.bind
Pfs_rpcapi_srv.Elect.V1.bind
~proc_null:(fun () -> ())
~proc_announce:(proc_announce nn_config)
~proc_set_coordinator:(proc_set_coordinator nn_config)
......
......@@ -4,7 +4,7 @@
It requests notifications from the main nameserver.
*)
open Plasma_rpcapi_aux
open Pfs_rpcapi_aux
open Plasma_util.Operators
type value =
......@@ -45,10 +45,10 @@ let get_cache() =
Cache_var.get cachename
module Rnot_proxy =
Plasma_rpcapi_clnt.Make'Request_notifications(Rpc_proxy.ManagedClient)
Pfs_rpcapi_clnt.Make'Request_notifications(Rpc_proxy.ManagedClient)
module Fsys_proxy =
Plasma_rpcapi_clnt.Make'Filesystem(Rpc_proxy.ManagedClient)
Pfs_rpcapi_clnt.Make'Filesystem(Rpc_proxy.ManagedClient)
let get_nn_client cache =
match cache.nn_client with
......@@ -63,8 +63,8 @@ let get_nn_client cache =
let esys = (Netplex_cenv.self_cont()) # event_system in
let mclient_config =
Rpc_proxy.ManagedClient.create_mclient_config
~programs:[ Plasma_rpcapi_clnt.Request_notifications.V1._program;
Plasma_rpcapi_clnt.Filesystem.V1._program;
~programs:[ Pfs_rpcapi_clnt.Request_notifications.V1._program;
Pfs_rpcapi_clnt.Filesystem.V1._program;
]
() in
let mclient =
......@@ -259,12 +259,12 @@ let expire cache =
let setup srv () =
Plasma_rpcapi_srv.Inode_cache.V1.bind_async
Pfs_rpcapi_srv.Inode_cache.V1.bind_async
~proc_null:(fun _ _ emit -> emit())
~proc_is_up_to_date
~proc_is_up_to_date_seqno
srv;
Plasma_rpcapi_srv.Notifications.V1.bind_async
Pfs_rpcapi_srv.Notifications.V1.bind_async
~proc_null:(fun _ _ emit -> emit())
~proc_inode_update
srv
......
......@@ -118,7 +118,7 @@ let extract_port cont =
let factory() =
Rpc_netplex.rpc_factory
~configure:(fun cf cfaddr ->
let db_conf = Plasma_db.extract_db_config cf in
let db_conf = Pfs_db.extract_db_config cf in
let nn_conf = Nn_config.extract_node_config cf in
(cf, cfaddr, db_conf, nn_conf)
)
......
......@@ -199,7 +199,7 @@ let discover ?(when_done = fun _ -> ()) saddr =
Plasma_util.connector_of_sockaddr saddr in
let esys = (Netplex_cenv.self_cont()) # event_system in
let client =
Plasma_rpcapi_clnt.Datanode.V1.create_client2
Pfs_rpcapi_clnt.Datanode.V1.create_client2
~esys
(`Socket(Rpc.Tcp, conn, Rpc_client.default_socket_config)) in
Rpc_client.configure client 0 conf#dn_node_timeout;
......@@ -216,7 +216,7 @@ let discover ?(when_done = fun _ -> ()) saddr =
try
(** First, get the node's identity, and look this up in our table: *)
Plasma_rpcapi_clnt.Datanode.V1.identity'async
Pfs_rpcapi_clnt.Datanode.V1.identity'async
client
conf#nn_clustername
(fun get_reply ->
......@@ -227,7 +227,7 @@ let discover ?(when_done = fun _ -> ()) saddr =
(** ok, we know this identity. Now check whether size and
blocksize are compatible
*)
Plasma_rpcapi_clnt.Datanode.V1.blocksize'async
Pfs_rpcapi_clnt.Datanode.V1.blocksize'async
client
()
(fun get_reply ->
......@@ -235,7 +235,7 @@ let discover ?(when_done = fun _ -> ()) saddr =
let bs = get_reply() in
if bs <> blocksize then
failwith "Node has wrong blocksize";
Plasma_rpcapi_clnt.Datanode.V1.size'async
Pfs_rpcapi_clnt.Datanode.V1.size'async
client
()
(fun get_reply ->
......
......@@ -32,7 +32,7 @@ let get_nots() =
Nots_var.get notsname
module Nots_proxy =
Plasma_rpcapi_clnt.Make'Notifications(Rpc_proxy.ManagedClient)
Pfs_rpcapi_clnt.Make'Notifications(Rpc_proxy.ManagedClient)
let remove_entry nots e =
( try
......@@ -70,7 +70,7 @@ let create_client conn =
let esys = (Netplex_cenv.self_cont()) # event_system in
let mclient_config =
Rpc_proxy.ManagedClient.create_mclient_config
~programs:[ Plasma_rpcapi_clnt.Notifications.V1._program ]
~programs:[ Pfs_rpcapi_clnt.Notifications.V1._program ]
~msg_timeout:5.0
~msg_timeout_is_fatal:true
~idle_timeout:5.0
......@@ -243,7 +243,7 @@ let proc_on_inode_update (inode,exp,destination) =
let setup srv =
Plasma_rpcapi_srv.Request_notifications.V1.bind
Pfs_rpcapi_srv.Request_notifications.V1.bind
~proc_null:(fun () -> ())
~proc_on_inode_update
srv
(* $Id$ *)
module Nslave_proxy = Plasma_rpcapi_clnt.Make'Nameslave(Rpc_proxy.ManagedClient)
module Nslave_proxy = Pfs_rpcapi_clnt.Make'Nameslave(Rpc_proxy.ManagedClient)
type client = Rpc_proxy.ManagedClient.mclient
let create_client conn tmo esys =
let mclient_config =
Rpc_proxy.ManagedClient.create_mclient_config
~programs:[ Plasma_rpcapi_clnt.Nameslave.V1._program ]
~programs:[ Pfs_rpcapi_clnt.Nameslave.V1._program ]
~msg_timeout:tmo
~msg_timeout_is_fatal:true
~initial_ping:true
......
......@@ -242,8 +242,8 @@ let onclose_nameslave srv conn_id =
(** Binding RPC servers: *)
let setup srv (conf:Nn_config.nn_node_config) =
(* TODO: Plasma_rpcapi_srv.Filesystem.V1.bind_async ... *)
Plasma_rpcapi_srv.Coordination.V1.bind
(* TODO: Pfs_rpcapi_srv.Filesystem.V1.bind_async ... *)
Pfs_rpcapi_srv.Coordination.V1.bind
~proc_null:(fun () -> ())
~proc_find_coordinator:(fun cname ->
if cname = conf#nn_clustername then
......@@ -264,7 +264,7 @@ let setup srv (conf:Nn_config.nn_node_config) =
let no_dn_admin name _ =
failwith ("Dn_admin." ^ name ^ ": Not available on slave node") in
Plasma_rpcapi_srv.Dn_admin.V1.bind
Pfs_rpcapi_srv.Dn_admin.V1.bind
~proc_null:(fun () -> ())
~proc_add_datanode:(no_dn_admin "add_datanode")
~proc_enable_datanode:(no_dn_admin "enable_datanode")
......@@ -275,7 +275,7 @@ let setup srv (conf:Nn_config.nn_node_config) =
~proc_destroy_datanode:(no_dn_admin "destroy_datanode")
srv;
Plasma_rpcapi_srv.Nameslave.V1.bind_async
Pfs_rpcapi_srv.Nameslave.V1.bind_async
~proc_null:(fun _ _ emit -> emit ())
~proc_begin_transaction:(proc_begin_transaction conf)
~proc_prepare_commit
......
......@@ -4,7 +4,7 @@ open Printf
open Nn_config
open Plasma_util.Operators
module A = Plasma_rpcapi_aux
module A = Pfs_rpcapi_aux
type errno =
Plasma_util.errno
......@@ -112,7 +112,7 @@ object
number:int ->
pref:string list ->
transacted_datastores ->
Plasma_rpcapi_aux.blocklist Uq_engines.engine
Pfs_rpcapi_aux.blocklist Uq_engines.engine
method blockmap_dealloc_e : (string * int64) list ->
unit Uq_engines.engine
method blockmap_load_e : unit -> unit Uq_engines.engine
......@@ -124,28 +124,28 @@ class type inode_view_t =
object
inherit view_t
method inode_get_e : id:int64 ->
Plasma_rpcapi_aux.inodeinfo option Uq_engines.engine
method inode_alloc_e : Plasma_rpcapi_aux.inodeinfo ->
Pfs_rpcapi_aux.inodeinfo option Uq_engines.engine
method inode_alloc_e : Pfs_rpcapi_aux.inodeinfo ->
int64 Uq_engines.engine
method inode_upd_e : id:int64 ->
keep_blocklimit:bool ->
Plasma_rpcapi_aux.inodeinfo ->
Pfs_rpcapi_aux.inodeinfo ->
unit Uq_engines.engine
method inode_dealloc_e : id:int64 -> unit Uq_engines.engine
method inode_get_blocks_e : id:int64 ->
blkidx:int64 ->
len:int64 ->
bm_view_t ->
Plasma_rpcapi_aux.blockinfo list Uq_engines.engine
Pfs_rpcapi_aux.blockinfo list Uq_engines.engine
method inode_upd_blocks_e : id:int64 ->
del:(int64 * int64) ->
add:Plasma_rpcapi_aux.blockinfo list ->
add:Pfs_rpcapi_aux.blockinfo list ->
set_mtime:bool ->
set_blocklimit:int64 ->
unit Uq_engines.engine
method inode_upd_time : id:int64 ->
mtime:Plasma_rpcapi_aux.time option ->
ctime:Plasma_rpcapi_aux.time option ->
mtime:Pfs_rpcapi_aux.time option ->
ctime:Pfs_rpcapi_aux.time option ->
unit
method filename_get_e : name:string ->
int64 option Uq_engines.engine
......@@ -647,7 +647,7 @@ let allocate_trivial_strategy blockmaps td ownobj repl index number =
td.td_safetrans_secret
new_block in
let bi =
{ Plasma_rpcapi_aux.index = index_k;
{ Pfs_rpcapi_aux.index = index_k;
node = node;
node_alive = true;
identity = bm#identity;
......@@ -765,7 +765,7 @@ let allocate_enblock blockmaps td ownobj repl index number pref =
td.td_safetrans_id
td.td_safetrans_secret
blocknr in
{ Plasma_rpcapi_aux.index = index;
{ Pfs_rpcapi_aux.index = index;
node = node;
node_alive = true;
identity = bm#identity;
......@@ -1200,8 +1200,8 @@ end
(**********************************************************************)
type inode_detail =
{ i_info : Plasma_rpcapi_aux.inodeinfo;
i_blocks : (int64, Plasma_rpcapi_aux.blockinfo list option) Hashtbl.t
{ i_info : Pfs_rpcapi_aux.inodeinfo;
i_blocks : (int64, Pfs_rpcapi_aux.blockinfo list option) Hashtbl.t
}
type inode =
......@@ -1259,7 +1259,7 @@ object(self)
bmv # blockmap_keep
(List.map
(fun bi ->
(bi.Plasma_rpcapi_aux.identity, bi.Plasma_rpcapi_aux.block)
(bi.Pfs_rpcapi_aux.identity, bi.Pfs_rpcapi_aux.block)
)
bis
)
......@@ -1322,7 +1322,7 @@ object(self)
(fun bi ->
let p_miss =
Hashtbl.mem
missing bi.Plasma_rpcapi_aux.index in
missing bi.Pfs_rpcapi_aux.index in
if p_miss then
l := bi :: !l
)
......@@ -1366,7 +1366,7 @@ object(self)
new Uq_engines.epsilon_engine (`Done id) esys
))
(fun id ->
let ii' = { ii with Plasma_rpcapi_aux.blocklimit = 0L } in
let ii' = { ii with Pfs_rpcapi_aux.blocklimit = 0L } in
Queue.push (`Inode_ins(id,ii')) journal;
let d = { i_info = ii'; i_blocks = Hashtbl.create 7 } in
let i = { i_id = id; i_detail = Some d } in
......@@ -1415,26 +1415,26 @@ object(self)
let now = Unix.gettimeofday() in
let new_ii =
{ new_ii0 with
Plasma_rpcapi_aux.blocklimit = (
Pfs_rpcapi_aux.blocklimit = (
match blocklimit with
| `Ignore ->
old_ii.Plasma_rpcapi_aux.blocklimit
old_ii.Pfs_rpcapi_aux.blocklimit
| `Set n ->
n
| `Update ->
new_ii0.Plasma_rpcapi_aux.blocklimit
new_ii0.Pfs_rpcapi_aux.blocklimit
);
mtime = (
if set_mtime then
encap_time now
else
new_ii0.Plasma_rpcapi_aux.mtime);
new_ii0.Pfs_rpcapi_aux.mtime);
ctime = (
if set_ctime then
encap_time now
else
new_ii0.Plasma_rpcapi_aux.ctime);
seqno = Int64.succ old_ii.Plasma_rpcapi_aux.seqno
new_ii0.Pfs_rpcapi_aux.ctime);
seqno = Int64.succ old_ii.Pfs_rpcapi_aux.seqno
} in
let i_detail =
try
......@@ -1463,7 +1463,7 @@ object(self)
(** Now apply new_bis: *)
List.iter
(fun bi ->
let idx = bi.Plasma_rpcapi_aux.index in
let idx = bi.Pfs_rpcapi_aux.index in
try
let old_bis_opt =
Hashtbl.find i_detail.i_blocks idx in
......@@ -1724,7 +1724,7 @@ object(self)
| None ->
transerr_e `enoient esys
| Some ii ->
match ii.Plasma_rpcapi_aux.filetype with
match ii.Pfs_rpcapi_aux.filetype with
| `ftype_directory ->
(** Get other names of the directory *)
self # filename_rev_get_e ~inode
......@@ -1766,7 +1766,7 @@ object(self)
| Some parent_ii ->
(** Check whether the parent is a directory *)
let ft =
parent_ii.Plasma_rpcapi_aux.filetype in
parent_ii.Pfs_rpcapi_aux.filetype in
if ft <> `ftype_directory then
transerr_e `efhier esys
else
......@@ -1864,7 +1864,7 @@ object(self)
(** Regular files and symlinks can be
always deleted
*)
let ft = ii.Plasma_rpcapi_aux.filetype in
let ft = ii.Pfs_rpcapi_aux.filetype in
match ft with
| `ftype_regular | `ftype_symlink ->
self # push_unlink_e ~name ~inode (n-1)
......
......@@ -209,7 +209,7 @@ object
number:int ->
pref:string list ->
transacted_datastores ->
Plasma_rpcapi_aux.blocklist Uq_engines.engine
Pfs_rpcapi_aux.blocklist Uq_engines.engine
(** Reserve blocks and allocate at commit time. [index] is the first
index number to use in the returned list of blocks, [index+number-1]
is the last index number. For each index blocks are allocated on
......@@ -240,15 +240,15 @@ object
inherit view_t
method inode_get_e : id:int64 ->
Plasma_rpcapi_aux.inodeinfo option Uq_engines.engine
method inode_alloc_e : Plasma_rpcapi_aux.inodeinfo ->
Pfs_rpcapi_aux.inodeinfo option Uq_engines.engine
method inode_alloc_e : Pfs_rpcapi_aux.inodeinfo ->
int64 Uq_engines.engine
(** Inserts a new inode and returns the ID. One cannot set the
blocklimit (it is always 0)
*)
method inode_upd_e : id:int64 ->
keep_blocklimit:bool ->
Plasma_rpcapi_aux.inodeinfo ->
Pfs_rpcapi_aux.inodeinfo ->
unit Uq_engines.engine
(** Updates the inode. Note that an update of [blocklimit] is only allowed
if [keep_blocklimit=false]. [filetype] changes are silently ignored.
......@@ -262,13 +262,13 @@ object
blkidx:int64 ->
len:int64 ->
bm_view_t ->
Plasma_rpcapi_aux.blockinfo list Uq_engines.engine
Pfs_rpcapi_aux.blockinfo list Uq_engines.engine
(** returns blocks. These blocks are immediately marked as to keep in