Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue0402 #39

Merged
merged 3 commits into from
Jun 30, 2023
Merged

Issue0402 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb74c5b
add some log
xiaoleizi2016 Apr 2, 2023
42950cf
logic db
xiaoleizi2016 Apr 2, 2023
472fff2
Merge branch 'master' into issue0402
xiaoleizi2016 Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/obproxy/obutils/ob_proxy_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ class ObProxyConfig : public common::ObCommonConfig
DEF_BOOL(enable_mysql_proxy_pool, "true", "if enabled, will long conn for sequence ", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER);

// sidecar
DEF_BOOL(enable_sharding, "false", "if enabled means use beyond trust", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER);
DEF_BOOL(enable_sharding, "false", "if enabled means use logic db", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER);
DEF_STR(sidecar_node_id, "", "node id for dbmesh", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER);
DEF_STR(dataplane_host, "", "dataplane address or hostname", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER);
DEF_BOOL(use_local_dbconfig, "false", "if enabled, start dbmesh with local dbconfig", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER);
Expand Down
5 changes: 3 additions & 2 deletions src/obproxy/utils/ob_layout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,10 @@ int ObLayout::construct_dirs()
} else if (OB_FAIL(construct_single_dir(CONF_PATH, conf_dir_))) {
MPRINT("fail to construct .conf dir, ret=%d", ret);
} else if (OB_FAIL(construct_single_dir(CONTROL_CONFIG_PATH, control_config_dir_))) {
MPRINT("fail to construct .conf dir, ret=%d", ret);
MPRINT("fail to construct control-config dir, ret=%d", ret);
} else if (OB_FAIL(construct_single_dir(DBCONFIG_PATH, dbconfig_dir_))) {
} else { }
MPRINT("fail to construct sharding-config dir, ret=%d", ret);
}

return ret;
}
Expand Down