Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mobject-store
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sds
mobject-store
Commits
1b6cdf89
Commit
1b6cdf89
authored
Feb 07, 2019
by
Rob Latham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use new bake_perror routine
parent
b9cfb4cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
src/server/core/core-write-op.cpp
src/server/core/core-write-op.cpp
+11
-8
src/server/mobject-server-daemon.c
src/server/mobject-server-daemon.c
+5
-0
No files found.
src/server/core/core-write-op.cpp
View file @
1b6cdf89
...
...
@@ -143,16 +143,16 @@ void write_op_exec_write(void* u, buffer_u buf, size_t len, uint64_t offset)
if
(
len
>
SMALL_REGION_THRESHOLD
)
{
ret
=
bake_create
(
bake_ph
,
bti
,
len
,
&
rid
);
if
(
ret
!=
0
)
{
ERROR
fprintf
(
stderr
,
"bake_create returned %d
\n
"
,
ret
);
ERROR
bake_perror
(
"bake_create
"
,
ret
);
return
;
}
ret
=
bake_proxy_write
(
bake_ph
,
rid
,
0
,
remote_bulk
,
buf
.
as_offset
,
remote_addr_str
,
len
);
if
(
ret
!=
0
)
{
ERROR
fprintf
(
stderr
,
"bake_proxy_write returned %d
\n
"
,
ret
);
ERROR
bake_perror
(
"bake_proxy_write
"
,
ret
);
}
ret
=
bake_persist
(
bake_ph
,
rid
,
offset
,
len
);
if
(
ret
!=
0
)
{
ERROR
fprintf
(
stderr
,
"bake_persist returned %d
\n
"
,
ret
);
ERROR
bake_perror
(
"bake_persist
"
,
ret
);
}
insert_region_log_entry
(
sdskv_ph
,
seg_db_id
,
oid
,
offset
,
len
,
&
rid
);
...
...
@@ -215,19 +215,19 @@ void write_op_exec_writesame(void* u, buffer_u buf, size_t data_len, size_t writ
ret
=
bake_create
(
bph
,
bti
,
data_len
,
&
rid
);
if
(
ret
!=
0
)
{
ERROR
fprintf
(
stderr
,
"bake_create returned %d
\n
"
,
ret
);
ERROR
bake_perror
(
"bake_create
"
,
ret
);
LEAVING
;
return
;
}
ret
=
bake_proxy_write
(
bph
,
rid
,
0
,
remote_bulk
,
buf
.
as_offset
,
remote_addr_str
,
data_len
);
if
(
ret
!=
0
)
{
ERROR
fprintf
(
stderr
,
"bake_proxy_write returned %d
\n
"
,
ret
);
ERROR
bake_perror
(
"bake_proxy_write
"
,
ret
);
LEAVING
;
return
;
}
ret
=
bake_persist
(
bph
,
rid
,
offset
,
data_len
);
if
(
ret
!=
0
)
{
ERROR
fprintf
(
stderr
,
"bake_persist returned %d
\n
"
,
ret
);
ERROR
bake_perror
(
"bake_persist
"
,
ret
);
LEAVING
;
return
;
}
...
...
@@ -299,8 +299,11 @@ void write_op_exec_append(void* u, buffer_u buf, size_t len)
bake_region_id_t
rid
;
ret
=
bake_create
(
bph
,
bti
,
len
,
&
rid
);
if
(
ret
!=
0
)
bake_perror
(
"bake_create"
,
ret
);
ret
=
bake_proxy_write
(
bph
,
rid
,
0
,
remote_bulk
,
buf
.
as_offset
,
remote_addr_str
,
len
);
if
(
ret
!=
0
)
bake_perror
(
"bake_proxy_write"
,
ret
);
ret
=
bake_persist
(
bph
,
rid
,
offset
,
len
);
if
(
ret
!=
0
)
bake_perror
(
"bake_persist"
,
ret
);
insert_region_log_entry
(
sdskv_ph
,
seg_db_id
,
oid
,
offset
,
len
,
&
rid
,
ts
);
...
...
@@ -406,8 +409,8 @@ void write_op_exec_remove(void* u)
ret
=
bake_remove
(
bake_ph
,
region
);
if
(
ret
!=
BAKE_SUCCESS
)
{
/* XXX should save the error and keep removing */
ERROR
fprintf
(
stderr
,
"write_op_exec_remove: "
"error in bake_remove()
(ret = %d)
\n
"
,
ret
);
ERROR
bake_perror
(
"write_op_exec_remove: "
"error in bake_remove()"
,
ret
);
LEAVING
;
return
;
}
...
...
src/server/mobject-server-daemon.c
View file @
1b6cdf89
...
...
@@ -84,21 +84,26 @@ int main(int argc, char *argv[])
if
(
-
1
==
access
(
bake_target_name
,
F_OK
))
{
// XXX creating a pool of 10MB - this should come from a config file
ret
=
bake_makepool
(
bake_target_name
,
10
*
1024
*
1024
,
0664
);
if
(
ret
!=
0
)
bake_perror
(
"bake_makepool"
,
ret
);
ASSERT
(
ret
==
0
,
"bake_makepool() failed (ret = %d)
\n
"
,
ret
);
}
bake_provider_t
bake_prov
;
bake_target_id_t
bake_tid
;
ret
=
bake_provider_register
(
mid
,
bake_mplex_id
,
BAKE_ABT_POOL_DEFAULT
,
&
bake_prov
);
if
(
ret
!=
0
)
bake_perror
(
"bake_provider_register"
,
ret
);
ASSERT
(
ret
==
0
,
"bake_provider_register() failed (ret = %d)
\n
"
,
ret
);
ret
=
bake_provider_add_storage_target
(
bake_prov
,
bake_target_name
,
&
bake_tid
);
if
(
ret
!=
0
)
bake_perror
(
"bake_provider_add_storage_target"
,
ret
);
ASSERT
(
ret
==
0
,
"bake_provider_add_storage_target() failed to add target %s (ret = %d)
\n
"
,
bake_target_name
,
ret
);
/* Bake provider handle initialization from self addr */
bake_client_data
bake_clt_data
;
ret
=
bake_client_init
(
mid
,
&
(
bake_clt_data
.
client
));
if
(
ret
!=
0
)
bake_perror
(
"bake_client_init"
,
ret
);
ASSERT
(
ret
==
0
,
"bake_client_init() failed (ret = %d)
\n
"
,
ret
);
ret
=
bake_provider_handle_create
(
bake_clt_data
.
client
,
self_addr
,
bake_mplex_id
,
&
(
bake_clt_data
.
provider_handle
));
if
(
ret
!=
0
)
bake_perror
(
"bake_provider_handle_create"
,
ret
);
ASSERT
(
ret
==
0
,
"bake_provider_handle_create() failed (ret = %d)
\n
"
,
ret
);
margo_push_finalize_callback
(
mid
,
&
finalize_bake_client_cb
,
(
void
*
)
&
bake_clt_data
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment