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
423846ac
Commit
423846ac
authored
Mar 05, 2019
by
Shane Snyder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add server daemon option for selecting kv backend
parent
003b5b20
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
14 deletions
+32
-14
include/mobject-server.h
include/mobject-server.h
+3
-1
src/server/mobject-daemon-helper.c
src/server/mobject-daemon-helper.c
+6
-5
src/server/mobject-server-daemon.c
src/server/mobject-server-daemon.c
+23
-8
No files found.
include/mobject-server.h
View file @
423846ac
...
...
@@ -55,7 +55,9 @@ int mobject_provider_register(
*
* @return 0 on success, negative error code on failure
*/
int
mobject_sdskv_provider_setup
(
sdskv_provider_t
sdskv_prov
);
int
mobject_sdskv_provider_setup
(
sdskv_provider_t
sdskv_prov
,
sdskv_database_id_t
sdskv_backend
);
#ifdef __cplusplus
}
...
...
src/server/mobject-daemon-helper.c
View file @
423846ac
...
...
@@ -18,7 +18,8 @@ static int name_map_compare(const void*, size_t, const void*, size_t);
static
int
seg_map_compare
(
const
void
*
,
size_t
,
const
void
*
,
size_t
);
static
int
omap_map_compare
(
const
void
*
,
size_t
,
const
void
*
,
size_t
);
int
mobject_sdskv_provider_setup
(
sdskv_provider_t
sdskv_prov
)
int
mobject_sdskv_provider_setup
(
sdskv_provider_t
sdskv_prov
,
sdskv_database_id_t
sdskv_backend
)
{
int
ret
;
/* SDSKV provider initialization */
...
...
@@ -33,28 +34,28 @@ int mobject_sdskv_provider_setup(sdskv_provider_t sdskv_prov)
config
.
db_name
=
"oid_map"
;
config
.
db_path
=
""
;
config
.
db_type
=
KVDB_MAP
;
config
.
db_type
=
sdskv_backend
;
config
.
db_comp_fn_name
=
"mobject_oid_map_compare"
;
ret
=
sdskv_provider_attach_database
(
sdskv_prov
,
&
config
,
&
oid_map_id
);
ASSERT
(
ret
==
0
,
"sdskv_provider_attach_database() failed to add database
\"
oid_map
\"
(ret = %d)
\n
"
,
ret
);
config
.
db_name
=
"name_map"
;
config
.
db_path
=
""
;
config
.
db_type
=
KVDB_MAP
;
config
.
db_type
=
sdskv_backend
;
config
.
db_comp_fn_name
=
"mobject_name_map_compare"
;
ret
=
sdskv_provider_attach_database
(
sdskv_prov
,
&
config
,
&
name_map_id
);
ASSERT
(
ret
==
0
,
"sdskv_provider_attach_database() failed to add database
\"
name_map
\"
(ret = %d)
\n
"
,
ret
);
config
.
db_name
=
"seg_map"
;
config
.
db_path
=
""
;
config
.
db_type
=
KVDB_MAP
;
config
.
db_type
=
sdskv_backend
;
config
.
db_comp_fn_name
=
"mobject_seg_map_compare"
;
ret
=
sdskv_provider_attach_database
(
sdskv_prov
,
&
config
,
&
seg_map_id
);
ASSERT
(
ret
==
0
,
"sdskv_provider_attach_database() failed to add database
\"
seg_map
\"
(ret = %d)
\n
"
,
ret
);
config
.
db_name
=
"omap_map"
;
config
.
db_path
=
""
;
config
.
db_type
=
KVDB_MAP
;
config
.
db_type
=
sdskv_backend
;
config
.
db_comp_fn_name
=
"mobject_omap_map_compare"
;
ret
=
sdskv_provider_attach_database
(
sdskv_prov
,
&
config
,
&
omap_map_id
);
ASSERT
(
ret
==
0
,
"sdskv_provider_attach_database() failed to add database
\"
omap_map
\"
(ret = %d)
\n
"
,
ret
);
...
...
src/server/mobject-server-daemon.c
View file @
423846ac
...
...
@@ -30,16 +30,20 @@ typedef struct {
}
sdskv_client_data
;
typedef
struct
{
char
*
listen_addr
;
char
*
cluster_file
;
size_t
pool_size
;
char
*
listen_addr
;
char
*
cluster_file
;
sdskv_db_type_t
kv_backend
;
size_t
pool_size
;
}
mobject_server_options
;
static
void
usage
(
void
)
{
fprintf
(
stderr
,
"Usage: mobject-server-daemon <listen_addr> <cluster_file>
\n
"
);
fprintf
(
stderr
,
"Usage: mobject-server-daemon
[OPTIONS]
<listen_addr> <cluster_file>
\n
"
);
fprintf
(
stderr
,
" <listen_addr> the Mercury address to listen on
\n
"
);
fprintf
(
stderr
,
" <cluster_file> the file to write mobject cluster connect info to
\n
"
);
fprintf
(
stderr
,
" OPTIONS:
\n
"
);
fprintf
(
stderr
,
" --pool-size Bake pool size for each server [default: 1GiB]
\n
"
);
fprintf
(
stderr
,
" --kv-backend SDSKV backend to use (mapdb, leveldb, berkeleydb) [default: stdmap]
\n
"
);
exit
(
-
1
);
}
...
...
@@ -48,14 +52,24 @@ static void parse_args(int argc, char **argv, mobject_server_options *opts)
int
c
;
char
*
short_options
=
"p:"
;
struct
option
long_options
[]
=
{
{
"pool-size"
,
required_argument
,
0
,
'p'
},
{
"kv-backend"
,
required_argument
,
0
,
'k'
},
{
"pool-size"
,
required_argument
,
0
,
'p'
},
};
char
*
check
=
NULL
;
while
((
c
=
getopt_long
(
argc
,
argv
,
short_options
,
long_options
,
NULL
))
!=
-
1
)
{
switch
(
c
)
{
case
'k'
:
if
(
strcmp
(
optarg
,
"mapdb"
)
==
0
)
opts
->
kv_backend
=
KVDB_MAP
;
else
if
(
strcmp
(
optarg
,
"leveldb"
)
==
0
)
opts
->
kv_backend
=
KVDB_LEVELDB
;
else
if
(
strcmp
(
optarg
,
"berkeleydb"
)
==
0
)
opts
->
kv_backend
=
KVDB_BERKELEYDB
;
else
usage
();
break
;
case
'p'
:
opts
->
pool_size
=
strtoul
(
optarg
,
NULL
,
0
);
break
;
...
...
@@ -80,7 +94,8 @@ static void finalized_ssg_group_cb(void* data);
int
main
(
int
argc
,
char
*
argv
[])
{
mobject_server_options
server_opts
=
{
.
pool_size
=
10485760
,
/* 10 MiB default */
.
kv_backend
=
KVDB_MAP
,
.
pool_size
=
1
*
1024
*
1024
*
1024
,
/* 1 GiB default */
};
margo_instance_id
mid
;
int
ret
;
...
...
@@ -146,7 +161,7 @@ int main(int argc, char *argv[])
ret
=
sdskv_provider_register
(
mid
,
sdskv_mplex_id
,
SDSKV_ABT_POOL_DEFAULT
,
&
sdskv_prov
);
ASSERT
(
ret
==
0
,
"sdskv_provider_register() failed (ret = %d)
\n
"
,
ret
);
ret
=
mobject_sdskv_provider_setup
(
sdskv_prov
);
ret
=
mobject_sdskv_provider_setup
(
sdskv_prov
,
server_opts
.
kv_backend
);
/* SDSKV provider handle initialization from self addr */
sdskv_client_data
sdskv_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