Skip to content

Commit

Permalink
Merge pull request #39 from xiaoleizi2016/issue0402
Browse files Browse the repository at this point in the history
Issue0402
  • Loading branch information
wgs13579 authored Jun 30, 2023
2 parents bacd5fa + 472fff2 commit 227355a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/obproxy/obutils/ob_proxy_config.h
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
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

0 comments on commit 227355a

Please sign in to comment.