fix: GENAI modules fails to initialise

Signed-off-by: Wazir Ahmed <wazir@proxysql.com>
v4.0-mcp-stats
Wazir Ahmed 2 months ago
parent ae92ae265f
commit 471ebca74c

@ -121,8 +121,7 @@ class ProxySQL_GlobalVariables {
#endif /* PROXYSQLCLICKHOUSE */
#ifdef PROXYSQLGENAI
bool genai_enabled;
bool mcp_enabled;
bool genai;
#endif /* PROXYSQLGENAI */
int gr_bootstrap_mode;

@ -313,6 +313,10 @@ ProxySQL_GlobalVariables::ProxySQL_GlobalVariables() :
opt->add((const char *)"",0,0,0,(const char *)"Enable ClickHouse Server",(const char *)"--clickhouse-server");
#endif /* PROXYSQLCLICKHOUSE */
#ifdef PROXYSQLGENAI
opt->add((const char *)"",0,0,0,(const char *)"Enable GenAI Features",(const char *)"--genai");
#endif /* PROXYSQLGENAI */
confFile=new ProxySQL_ConfigFile();
};
@ -426,6 +430,13 @@ void ProxySQL_GlobalVariables::process_opts_pre() {
global.clickhouse_server=true;
}
#endif /* PROXYSQLCLICKHOUSE */
#ifdef PROXYSQLGENAI
if (opt->isSet("--genai")) {
global.genai=true;
}
#endif /* PROXYSQLGENAI */
update_string_var_if_set(&global.gr_bootstrap_uri, opt, "--bootstrap");
global.gr_bootstrap_mode = opt->isSet("--bootstrap");
update_ulong_var_if_set(global.gr_bootstrap_conf_base_port, opt, "--conf-base-port");

@ -957,6 +957,10 @@ void ProxySQL_Main_init_main_modules() {
#ifdef PROXYSQLGENAI
void ProxySQL_Main_init_GenAI_module() {
GloGATH = new GenAI_Threads_Handler();
GloGATH->init();
proxy_info("GenAI Threads Handler initialized\n");
GloAI = new AI_Features_Manager();
GloAI->init();
proxy_info("AI Features module initialized\n");
@ -1496,14 +1500,14 @@ void ProxySQL_Main_init_phase2___not_started(const bootstrap_info_t& boostrap_in
LoadPlugins();
ProxySQL_Main_init_main_modules();
#ifdef PROXYSQLGENAI
if (GloVars.global.genai_enabled) {
if (GloVars.global.genai) {
ProxySQL_Main_init_GenAI_module();
}
if (GloVars.global.mcp_enabled) {
ProxySQL_Main_init_MCP_module();
}
#endif /* PROXYSQLGENAI */
ProxySQL_Main_init_Admin_module(boostrap_info);
GloMTH->print_version();
@ -1602,18 +1606,6 @@ void ProxySQL_Main_init_phase3___start_all() {
#endif
}
{
cpu_timer t;
#ifdef PROXYSQLGENAI
if (GloVars.global.mcp_enabled && GloMCPH) {
ProxySQL_Main_init_MCP_module();
}
#endif /* PROXYSQLGENAI */
#ifdef DEBUG
std::cerr << "Main phase3 : MCP module initialized in ";
#endif
}
unsigned int iter = 0;
do { sleep_iter(++iter); } while (load_ != 1);
load_ = 0;
@ -1676,10 +1668,10 @@ void ProxySQL_Main_init_phase3___start_all() {
#ifdef PROXYSQLGENAI
// GenAI
if (GloVars.global.genai_enabled && GloGATH) {
GloAdmin->init_genai_variables();
}
if (GloVars.global.mcp_enabled && GloMCPH) {
if (GloVars.global.genai) {
if (GloGATH)
GloAdmin->init_genai_variables();
if (GloMCPH)
GloAdmin->init_mcp_variables();
}
#endif /* PROXYSQLGENAI */

Loading…
Cancel
Save