diff --git a/client/doris_client_fetch.cpp b/client/doris_client_fetch.cpp index 50ed19b..28318c6 100644 --- a/client/doris_client_fetch.cpp +++ b/client/doris_client_fetch.cpp @@ -15,6 +15,26 @@ #include "doris_client_fetch.h" +static int doris_md5_final_string(MD5_CTX *c, char *result, unsigned int size) +{ + unsigned char md5[17]={0}; + int i; + + if(MD5_Final(md5, c) != 1) + { + return -1; + } + if(size < 33) + return -1; + + for(i=0; i<16; i++) + { + sprintf(result + i*2, "%02x", md5[i]); + } + result[32] = '\0'; + return 0; +} + void easy_string_destroy(struct easy_string *estr) { if(estr->buff != NULL) @@ -55,7 +75,6 @@ void doris_confile_ctx_destry(struct doris_confile_ctx *ctx) void doris_update_new_version(struct doris_instance *instance) { instance->cur_version = instance->new_version; - instance->new_version += 1; } void doris_request_restart_timer(struct doris_instance *instance, time_t wait_s) @@ -84,6 +103,16 @@ void doris_fetch_next_confile_meta(struct doris_instance *instance) sub = cJSON_GetObjectItem(cur_a_item, "cfg_num"); instance->curmeta.cfg_num = sub->valueint; + + if(NULL != (sub = cJSON_GetObjectItem(cur_a_item, "md5"))) + { + instance->curmeta.validate_md5 = 1; + snprintf(instance->curmeta.md5str, 36, "%s", sub->valuestring); + } + else + { + instance->curmeta.validate_md5 = 0; + } } void doris_http_confile_header_cb(const char *start, size_t bytes, CURLcode code, long res_code, void *userp) @@ -102,7 +131,7 @@ void doris_http_confile_header_cb(const char *start, size_t bytes, CURLcode code if(res_code != 200 && res_code!=206) { MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_DEBUG, "Fetch confile %s failed, req_version=%lu, curlcode = %d", - instance->curmeta.table_name, instance->new_version, code); + instance->curmeta.table_name, instance->req_version, code); return; } instance->retry_times = 0; @@ -110,6 +139,7 @@ void doris_http_confile_header_cb(const char *start, size_t bytes, CURLcode code { instance->param->cbs.cfgfile_start(instance, instance->curmeta.table_name, instance->curmeta.size, instance->curmeta.cfg_num, instance->param->cbs.userdata); + MD5_Init(&instance->ctx.md5ctx); } } @@ -151,6 +181,7 @@ void doris_http_confile_body_cb(const char *ptr, size_t bytes, CURLcode code, lo } instance->param->cbs.cfgfile_update(instance, ptr, bytes, instance->param->cbs.userdata); + MD5_Update(&instance->ctx.md5ctx, ptr, bytes); instance->curmeta.curoffset += bytes; instance->statistic.field[DRS_FS_FILED_RES_BYTES] += bytes; } @@ -159,34 +190,49 @@ void doris_http_fetch_confile(struct doris_instance *instance); void doris_http_confile_done_cb(CURLcode res, long res_code, const char *err, void *userp) { struct doris_instance *instance = (struct doris_instance *)userp; + char md5buffer[64]; + bool direct_fail=false; - if(instance->ctx.res_code != 200 && instance->ctx.res_code!=206) - { - goto out_error; - } - - if(res!=CURLE_OK || (res_code!=200 && res_code!=206)) + if(res!=CURLE_OK) { MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "Fetch confile %s failed, req_version=%lu, curlcode = %d, error: %s", - instance->curmeta.table_name, instance->new_version, res_code, err); + instance->curmeta.table_name, instance->req_version, res_code, err); goto out_error; } + + if((instance->ctx.res_code != 200 && instance->ctx.res_code!=206) || (res_code!=200 && res_code!=206)) + { + goto out_error; + } + if(instance->ctx.contl_total != 0) { - MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_INFO, "Fetch confile %s success, req_version=%lu, Content-Range: %lu-%lu/%lu", - instance->curmeta.table_name, instance->new_version, instance->ctx.contl_start, instance->ctx.contl_end, instance->ctx.contl_total); + MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_DEBUG, "Fetch confile %s success, req_version=%lu, Content-Range: %lu-%lu/%lu", + instance->curmeta.table_name, instance->req_version, instance->ctx.contl_start, instance->ctx.contl_end, instance->ctx.contl_total); } else { - MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_INFO, "Fetch confile %s success, req_version=%lu, Content-Length: %lu/%lu", - instance->curmeta.table_name, instance->new_version, instance->ctx.contlength, instance->curmeta.size); + MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_DEBUG, "Fetch confile %s success, req_version=%lu, Content-Length: %lu/%lu", + instance->curmeta.table_name, instance->req_version, instance->ctx.contlength, instance->curmeta.size); } instance->statistic.field[DRS_FS_FILED_RES_FRAGS] += 1; if(instance->curmeta.curoffset >= instance->curmeta.size) //该文件下载完毕 { + doris_md5_final_string(&instance->ctx.md5ctx, md5buffer, 64); + if(instance->curmeta.validate_md5 && strcasecmp(instance->curmeta.md5str, md5buffer)) + { + MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "Fetch confile %s over, version=%lu, md5 validate fail, real: %s, expect: %s", + instance->curmeta.table_name, instance->req_version, md5buffer, instance->curmeta.md5str); + direct_fail=true;goto out_md5; + } + else + { + MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_INFO, "Fetch confile %s.010%lu over, md5: %s", + instance->curmeta.table_name, instance->req_version, md5buffer); + } instance->statistic.field[DRS_FS_FILED_RES_FILES] += 1; - instance->param->cbs.cfgfile_finish(instance, instance->param->cbs.userdata); + instance->param->cbs.cfgfile_finish(instance, md5buffer, instance->param->cbs.userdata); if(instance->array_index == instance->array_size) { instance->param->cbs.version_finish(instance, instance->param->cbs.userdata); @@ -209,16 +255,17 @@ void doris_http_confile_done_cb(CURLcode res, long res_code, const char *err, vo return; out_error: - instance->statistic.field[DRS_FS_FILED_RES_FRAGERR] += 1; if(instance->ctx.res_code == 404) //404应答的重新开始请求 { - instance->retry_times = instance->param->fetch_max_tries; + direct_fail = true; } else { instance->retry_times++; } - if(instance->retry_times >= instance->param->fetch_max_tries) +out_md5: + instance->statistic.field[DRS_FS_FILED_RES_FRAGERR] += 1; + if(instance->retry_times >= instance->param->fetch_max_tries || direct_fail) { instance->statistic.field[DRS_FS_FILED_RES_VERERR] += 1; instance->param->cbs.version_error(instance, instance->param->cbs.userdata); @@ -249,7 +296,7 @@ void doris_http_fetch_confile(struct doris_instance *instance) doris_http_ctx_add_header(instance->ctx.httpctx, range); } - snprintf(metauri, 128, "configfile?tablename=%s&version=%lu&businessid=%u", instance->curmeta.table_name, instance->new_version, instance->param->args.businessid); + snprintf(metauri, 128, "configfile?tablename=%s&version=%lu&businessid=%u", instance->curmeta.table_name, instance->req_version, instance->param->args.businessid); if(doris_http_launch_get_request(instance->ctx.httpctx, metauri)) { instance->statistic.field[DRS_FS_FILED_REQ_FAIL] += 1; @@ -259,7 +306,7 @@ void doris_http_fetch_confile(struct doris_instance *instance) { instance->statistic.field[DRS_FS_FILED_REQ_FILES] += 1; MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_INFO, "Launch confile %s GET, req_version=%lu, %s", - instance->curmeta.table_name, instance->new_version, range); + instance->curmeta.table_name, instance->req_version, range); } } @@ -278,7 +325,7 @@ void doris_http_meta_header_cb(const char *ptr, size_t bytes, CURLcode code, lon if(res_code != 200) { MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_DEBUG, "No new meta found, cur_version=%lu, req_version=%lu, curlcode = %d", - instance->cur_version, instance->new_version, code); + instance->cur_version, instance->req_version, code); } } @@ -297,25 +344,29 @@ void doris_http_meta_body_cb(const char *ptr, size_t bytes, CURLcode code, long void doris_http_meta_done_cb(CURLcode res, long res_code, const char *err, void *userp) { struct doris_instance *instance = (struct doris_instance *)userp; + cJSON *sub; - if(instance->ctx.res_code != 200) + if(res!=CURLE_OK) { + MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "Request meta failed, cur_version=%lu, req_version=%lu, curlcode = %d, error: %s", + instance->cur_version, instance->req_version, res_code, err); goto out_error; } - if(res!=CURLE_OK || res_code!=200) + if(instance->ctx.res_code != 200 || res_code!=200) { - MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "No new meta found, cur_version=%lu, req_version=%lu, curlcode = %d, error: %s", - instance->cur_version, instance->new_version, res_code, err); goto out_error; } instance->meta = cJSON_Parse(instance->estr.buff); if(instance->meta == NULL) { - MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "Parse meta failed, req_version=%lu, invalid json: %s", instance->new_version, instance->estr.buff); + MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "Parse meta failed, req_version=%lu, invalid json: %s", instance->req_version, instance->estr.buff); goto out_error; } + sub = cJSON_GetObjectItem(instance->meta, "version"); + instance->new_version = sub->valuedouble; + instance->req_version = instance->new_version; instance->statistic.field[DRS_FS_FILED_RES_META] += 1; MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_INFO, "NEW_META found, cur_version=%lu, newjson: %s", instance->cur_version, instance->estr.buff); @@ -366,9 +417,10 @@ static void doris_http_fetch_meta(struct doris_instance *instance) instance->ctx.httpctx = doris_http_ctx_new(instance->cur_httpins, &curlcbs, balance_seed); } + instance->req_version = instance->cur_version + 1; //只有版本更新成功后,cur_version才会更新 if(instance->ctx.httpctx != NULL) { - snprintf(metauri, 128, "configmeta?version=%lu&businessid=%u", instance->new_version, instance->param->args.businessid); + snprintf(metauri, 128, "configmeta?version=%lu&businessid=%u", instance->req_version, instance->param->args.businessid); if(!doris_http_launch_get_request(instance->ctx.httpctx, metauri)) { instance->status = FETCH_STATUS_META; @@ -387,7 +439,7 @@ static void doris_http_fetch_meta(struct doris_instance *instance) { instance->statistic.field[DRS_FS_FILED_REQ_FAIL] += 1; doris_request_restart_timer(instance, instance->param->retry_interval); - MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "Launch meta GET failed: no active host found,req_version=%lu", instance->new_version); + MESA_HANDLE_RUNTIME_LOGV2(instance->runtime_log, RLOG_LV_FATAL, "Launch meta GET failed: no active host found,req_version=%lu", instance->req_version); } } @@ -557,7 +609,7 @@ struct doris_instance *doris_instance_new(struct doris_parameter *param, struct instance->worker_evbase = worker_evbase; instance->runtime_log = runtimelog; instance->cur_version = param->args.current_version; - instance->new_version = instance->cur_version + 1; //TODO + instance->req_version = instance->cur_version + 1; //TODO instance->httpins_master = doris_http_instance_new(param->param_master, worker_evbase, runtimelog); if(instance->httpins_master == NULL) diff --git a/client/doris_client_fetch.h b/client/doris_client_fetch.h index 5b482eb..7125540 100644 --- a/client/doris_client_fetch.h +++ b/client/doris_client_fetch.h @@ -1,6 +1,7 @@ #ifndef __DORIS_CLIENT_FETCH_IN_H__ #define __DORIS_CLIENT_FETCH_IN_H__ +#include #include #include "doris_client.h" @@ -46,28 +47,32 @@ struct doris_parameter int32_t fsstat_status[FSSTAT_DORIS_STATUS_NUM]; }; -struct md5_long -{ - u_int64_t md5l; - u_int64_t md5h; -}; - struct fetch_file_meta { const char *table_name; size_t size; size_t curoffset; u_int32_t cfg_num; - union { - char md5[16]; - struct md5_long md5long; - }; + u_int32_t validate_md5; + char md5str[36]; +}; + +struct md5_long +{ + u_int64_t md5l; + u_int64_t md5h; +}; +union doris_md5 +{ + char md5[16]; + struct md5_long md5long; }; struct doris_confile_ctx { struct doris_http_ctx *httpctx; + MD5_CTX md5ctx; long res_code; size_t contlength; size_t contl_start; @@ -81,8 +86,9 @@ struct doris_instance u_int32_t retry_times; struct doris_http_instance *cur_httpins; - int64_t cur_version; - int64_t new_version; + int64_t cur_version; //元信息 + int64_t req_version; //文件 + int64_t new_version; //新的元信息 struct easy_string estr; cJSON *meta, *array; u_int32_t array_size; diff --git a/client/nirvana_conhash.cpp b/client/nirvana_conhash.cpp index 9a95403..99674fd 100644 --- a/client/nirvana_conhash.cpp +++ b/client/nirvana_conhash.cpp @@ -348,6 +348,7 @@ enum CONHASH_ERRCODE conhash_insert_bucket(struct consistent_hash *ch, const str } inner_bucket->bucket.bucket_id = bucket->bucket_id; inner_bucket->bucket.tag = bucket->tag; + inner_bucket->bucket_index = bucket_index; if(CONHASH_OK != (code=conhash_add_points(ch, inner_bucket, bucket->point_num))) { diff --git a/include/doris_client.h b/include/doris_client.h index fea6826..b994e11 100644 --- a/include/doris_client.h +++ b/include/doris_client.h @@ -57,7 +57,7 @@ struct doris_callbacks void (*version_start)(struct doris_instance *instance, cJSON *meta, void *userdata); //meta在整个版本声明周期内都有效 void (*cfgfile_start)(struct doris_instance *instance, const char *tablename, size_t size, u_int32_t cfgnum, void *userdata); void (*cfgfile_update)(struct doris_instance *instance, const char *data, size_t len, void *userdata); - void (*cfgfile_finish)(struct doris_instance *instance, void *userdata); + void (*cfgfile_finish)(struct doris_instance *instance, const char *md5, void *userdata); void (*version_error)(struct doris_instance *instance, void *userdata); //下载文件失败,该版本需要回滚 void (*version_finish)(struct doris_instance *instance, void *userdata); }; diff --git a/monitor/閰嶇疆鍒嗗彂缃戠粶杩愯鐘舵-1626422695467.json b/monitor/閰嶇疆鍒嗗彂缃戠粶杩愯鐘舵-1626422695467.json index 8cfb5c9..f8777aa 100644 --- a/monitor/閰嶇疆鍒嗗彂缃戠粶杩愯鐘舵-1626422695467.json +++ b/monitor/閰嶇疆鍒嗗彂缃戠粶杩愯鐘舵-1626422695467.json @@ -65,7 +65,7 @@ "scroll": true, "showHeader": true, "sort": { - "col": 2, + "col": 13, "desc": false }, "styles": [ @@ -288,7 +288,7 @@ "unit": "none" }, { - "alias": "UserState", + "alias": "RecvState", "colorMode": "cell", "colors": [ "rgba(245, 54, 54, 0.9)", @@ -315,8 +315,8 @@ "value": "0" }, { - "text": "plug HTTP down", - "value": "10" + "text": "VersionError", + "value": "3" } ] }, @@ -448,13 +448,6 @@ "intervalFactor": 1, "refId": "D" }, - { - "expr": "0+user_defined_status{job=~\"doris\"}", - "format": "table", - "instant": true, - "intervalFactor": 1, - "refId": "I" - }, { "expr": "0+latest_cfg_version{job=~\"doris\"}", "format": "table", @@ -468,6 +461,13 @@ "instant": true, "intervalFactor": 1, "refId": "L" + }, + { + "expr": "0+user_defined_status{job=~\"doris\"}", + "format": "table", + "instant": true, + "intervalFactor": 1, + "refId": "I" } ], "title": "Doris杩愯鐘舵", @@ -514,5 +514,5 @@ "timezone": "", "title": "閰嶇疆鍒嗗彂缃戠粶杩愯鐘舵", "uid": "HZfW8wi7k", - "version": 5 + "version": 7 } \ No newline at end of file diff --git a/server/bin/conf/doris_main.conf b/server/bin/conf/doris_main.conf index 5ad1007..d0ea133 100644 --- a/server/bin/conf/doris_main.conf +++ b/server/bin/conf/doris_main.conf @@ -2,7 +2,9 @@ worker_thread_num=2 server_listen_port=9898 manage_listen_port=2233 +https_connection_on=1 +#1-Doris client; 2-local file receive_config_way=2 cache_file_frag_size=67108864 store_config_path=./doris_store_path @@ -35,7 +37,7 @@ fsstat_log_dst_port=8125 [DORIS_CLIENT.master_server] max_connection_per_host=1 max_cnnt_pipeline_num=10 -https_connection_on=0 +https_connection_on=1 max_curl_session_num=10 http_server_listen_port=9897 diff --git a/server/doris_server_http.cpp b/server/doris_server_http.cpp index 69bbe29..1cff399 100644 --- a/server/doris_server_http.cpp +++ b/server/doris_server_http.cpp @@ -13,11 +13,12 @@ #include #include +#include + #include "doris_server_main.h" #include "doris_server_http.h" - -extern struct nirvana_global_info g_doris_server_info; +extern struct doris_global_info g_doris_server_info; static inline void set_sockopt_keepalive(int sd, int keepidle, int keepintvl, int keepcnt) { @@ -90,15 +91,18 @@ void doris_http_server_meta_cb(struct evhttp_request *req, void *arg) if(NULL == (version = evhttp_find_header(¶ms, "version"))) { statistic->statistic.field[DRS_FSSTAT_CLIENT_INVALID_REQ] += 1; + evhttp_clear_headers(¶ms); evhttp_send_error(req, HTTP_BADREQUEST, "Parameters invalid, no version found"); return; } if(0==(verlong = strtol(version, &endptr, 10)) || *endptr!='\0') { statistic->statistic.field[DRS_FSSTAT_CLIENT_INVALID_REQ] += 1; + evhttp_clear_headers(¶ms); evhttp_send_error(req, HTTP_BADREQUEST, "Parameter version invalid"); return; } + evhttp_clear_headers(¶ms); pthread_rwlock_rdlock(&g_doris_server_info.rwlock); if(verlong > g_doris_server_info.cfgver_head->latest_version) @@ -108,6 +112,7 @@ void doris_http_server_meta_cb(struct evhttp_request *req, void *arg) evhttp_send_error(req, HTTP_NOTMODIFIED, "No new configs found"); return; } + vernode = TAILQ_FIRST(&g_doris_server_info.cfgver_head->version_head); while(vernode->version < verlong) { @@ -193,6 +198,7 @@ void doris_response_file_range(struct evhttp_request *req, const char *tablename evhttp_add_header(evhttp_request_get_output_headers(req), "Content-Type", "application/stream"); evhttp_add_header(evhttp_request_get_output_headers(req), "Connection", "keep-alive"); evhttp_send_reply(req, HTTP_OK, "OK", evbuf); + evbuffer_free(evbuf); } void doris_http_server_file_cb(struct evhttp_request *req, void *arg) @@ -213,12 +219,14 @@ void doris_http_server_file_cb(struct evhttp_request *req, void *arg) } if(NULL==(version=evhttp_find_header(¶ms, "version")) || NULL==(tablename=evhttp_find_header(¶ms, "tablename"))) { + evhttp_clear_headers(¶ms); statistic->statistic.field[DRS_FSSTAT_CLIENT_INVALID_REQ] += 1; evhttp_send_error(req, HTTP_BADREQUEST, "Parameters invalid, no version/tablename found"); return; } if(0==(verlong = strtol(version, &endptr, 10)) || *endptr!='\0') { + evhttp_clear_headers(¶ms); statistic->statistic.field[DRS_FSSTAT_CLIENT_INVALID_REQ] += 1; evhttp_send_error(req, HTTP_BADREQUEST, "Parameter version invalid"); return; @@ -226,12 +234,14 @@ void doris_http_server_file_cb(struct evhttp_request *req, void *arg) if(NULL!=(content_range = evhttp_find_header(evhttp_request_get_input_headers(req), "Range")) && sscanf(content_range, "%*[^0-9]%lu-%lu", &req_start, &req_end)<1) { + evhttp_clear_headers(¶ms); statistic->statistic.field[DRS_FSSTAT_CLIENT_INVALID_REQ] += 1; evhttp_send_error(req, HTTP_BADREQUEST, "Header Range invalid"); return; } doris_response_file_range(req, tablename, verlong, req_start, req_end, (content_range==NULL)?false:true, statistic); + evhttp_clear_headers(¶ms); } void doris_http_server_generic_cb(struct evhttp_request *req, void *arg) @@ -239,6 +249,103 @@ void doris_http_server_generic_cb(struct evhttp_request *req, void *arg) evhttp_send_error(req, HTTP_BADREQUEST, "Not Supported."); } +pthread_t nirvana_pthreads_thread_id(void) +{ + return pthread_self(); +} + +void nirvana_pthreads_locking_callback(int mode, int type, const char *file, int line) +{ + if(mode & CRYPTO_LOCK) + { + pthread_mutex_lock(&g_doris_server_info.lock_cs[type]); + } + else + { + pthread_mutex_unlock(&g_doris_server_info.lock_cs[type]); + } +} + +int server_verify_callback(int ok, X509_STORE_CTX *ctx) +{ + X509 *client_cert; + char *subject, *issuer; + + client_cert = X509_STORE_CTX_get_current_cert(ctx); + + subject = X509_NAME_oneline(X509_get_subject_name(client_cert), 0, 0); + issuer = X509_NAME_oneline(X509_get_issuer_name(client_cert), 0, 0); + + MESA_RUNTIME_LOGV3(g_doris_server_info.log_runtime, RLOG_LV_DEBUG, "ClientCert suject: %s, issuer: %s, state: %d.", subject, issuer, ok); + OPENSSL_free(subject); + OPENSSL_free(issuer); + return ok; +} + +SSL_CTX *doris_connections_create_ssl_ctx(void) +{ + int crypto_num; + SSL_CTX *ssl_ctx; + char session_id_appname[] = "DorisServer"; + + SSL_library_init(); + SSLeay_add_ssl_algorithms(); + OpenSSL_add_all_algorithms(); + SSL_load_error_strings(); + ERR_load_BIO_strings(); + + crypto_num = CRYPTO_num_locks(); + g_doris_server_info.lock_cs = (pthread_mutex_t *)OPENSSL_malloc(crypto_num * sizeof(pthread_mutex_t)); + for(int i=0; imetacont); cJSON_Delete(vernode->metajson); cJSON_Delete(vernode->arrayjson); + cJSON_Delete(vernode->table_meta); free(vernode); } @@ -313,13 +314,11 @@ void doris_config_mem_version_error(struct doris_instance *instance, void *userd void doris_config_mem_cfgfile_start(struct doris_instance *instance, const char *tablename, size_t size, u_int32_t cfgnum, void *userdata) { struct confile_save *save=(struct confile_save *)userdata; - cJSON *table_meta; - table_meta = cJSON_CreateObject(); - cJSON_AddStringToObject(table_meta, "tablename", tablename); - cJSON_AddNumberToObject(table_meta, "cfg_num", cfgnum); - cJSON_AddNumberToObject(table_meta, "size", size); - cJSON_AddItemToArray(save->cur_vernode->arrayjson, table_meta); + save->cur_vernode->table_meta = cJSON_CreateObject(); + cJSON_AddStringToObject(save->cur_vernode->table_meta, "tablename", tablename); + cJSON_AddNumberToObject(save->cur_vernode->table_meta, "cfg_num", cfgnum); + cJSON_AddNumberToObject(save->cur_vernode->table_meta, "size", size); save->cur_table = (struct table_list_node *)calloc(1, sizeof(struct table_list_node)); snprintf(save->cur_table->tablename, 64, "%s", tablename); @@ -374,10 +373,14 @@ void doris_config_mem_cfgfile_update(struct doris_instance *instance, const char assert(save->cur_table->cur_totallen <= save->cur_table->filesize); } -void doris_config_mem_cfgfile_finish(struct doris_instance *instance, void *userdata) +void doris_config_mem_cfgfile_finish(struct doris_instance *instance, const char *md5, void *userdata) { struct confile_save *save=(struct confile_save *)userdata; + cJSON_AddStringToObject(save->cur_vernode->table_meta, "md5", md5); + cJSON_AddItemToArray(save->cur_vernode->arrayjson, save->cur_vernode->table_meta); + save->cur_vernode->table_meta = NULL; + if(save->cur_frag != NULL) { TAILQ_INSERT_TAIL(&save->cur_table->frag_head, save->cur_frag, frag_node); @@ -421,12 +424,16 @@ void doris_config_common_version_finish(struct confile_save *save) MESA_Monitor_operation(g_doris_server_info.monitor, g_doris_server_info.mm_latest_ver, MONITOR_VALUE_SET, save->version); MESA_Monitor_operation(g_doris_server_info.monitor, g_doris_server_info.mm_total_cfgnum, MONITOR_VALUE_SET, save->statistic.statistic.status[DRS_FSSTAT_CONFIG_TOTAL_NUM]); + MESA_Monitor_set_status_code(g_doris_server_info.monitor, MONITOR_STATUS_OP_CLEAR, MONITOR_STATUS_VERSION_ERR, NULL, NULL); MESA_RUNTIME_LOGV3(g_doris_server_info.log_runtime, RLOG_LV_INFO, "Version %lu update finished", save->version); } void doris_config_common_version_error(struct confile_save *save) { save->statistic.statistic.field[DRS_FSSTAT_RECV_ERR_VER] += 1; + //Grafana+Promethues,展示内部异常状态 + MESA_Monitor_set_status_code(g_doris_server_info.monitor, MONITOR_STATUS_OP_SET, MONITOR_STATUS_VERSION_ERR, + "Version receive error", "Receive config file error, please check producer"); } void doris_config_common_cfgfile_start(struct confile_save *save, u_int32_t cfgnum) @@ -485,12 +492,12 @@ void doris_config_localmem_cfgfile_update(struct doris_instance *instance, const } } -void doris_config_localmem_cfgfile_finish(struct doris_instance *instance, void *userdata) +void doris_config_localmem_cfgfile_finish(struct doris_instance *instance, const char *md5, void *userdata) { doris_config_common_cfgfile_finish((struct confile_save *)userdata); if(g_doris_server_info.server_role_sw) { - doris_config_mem_cfgfile_finish(instance, userdata); + doris_config_mem_cfgfile_finish(instance, md5, userdata); } } @@ -559,7 +566,7 @@ void doris_config_cfgfile_update(struct doris_instance *instance, const char *da } } -void doris_config_cfgfile_finish(struct doris_instance *instance, void *userdata) +void doris_config_cfgfile_finish(struct doris_instance *instance, const char *md5, void *userdata) { doris_config_common_cfgfile_finish((struct confile_save *)userdata); if(g_doris_server_info.write_file_sw) @@ -568,7 +575,7 @@ void doris_config_cfgfile_finish(struct doris_instance *instance, void *userdata } if(g_doris_server_info.server_role_sw) { - doris_config_mem_cfgfile_finish(instance, userdata); + doris_config_mem_cfgfile_finish(instance, md5, userdata); } } diff --git a/server/doris_server_receive.h b/server/doris_server_receive.h index 4de505b..73ec493 100644 --- a/server/doris_server_receive.h +++ b/server/doris_server_receive.h @@ -7,6 +7,7 @@ #include +#define MONITOR_STATUS_VERSION_ERR 3 enum DORIS_SERVER_FS_FILED { @@ -66,6 +67,7 @@ struct version_list_node int32_t metalen; int32_t cfg_type; //1-full, 2-inc cJSON *metajson, *arrayjson; + cJSON *table_meta; TAILQ_HEAD(__table_list_node, table_list_node) table_head; TAILQ_ENTRY(version_list_node) version_node; diff --git a/server/doris_server_scandir.cpp b/server/doris_server_scandir.cpp index de55e4a..2ac8696 100644 --- a/server/doris_server_scandir.cpp +++ b/server/doris_server_scandir.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -16,6 +17,26 @@ #define MESA_RUNTIME_LOGV4(handle, lv, fmt, args...) \ MESA_handle_runtime_log((handle), (lv), "DorisServer", "%s:%d, " fmt, __FILENAME__, __LINE__, ##args) +static int scandir_md5_final_string(MD5_CTX *c, char *result, unsigned int size) +{ + unsigned char md5[17]={0}; + int i; + + if(MD5_Final(md5, c) != 1) + { + return -1; + } + if(size < 33) + return -1; + + for(i=0; i<16; i++) + { + sprintf(result + i*2, "%02x", md5[i]); + } + result[32] = '\0'; + return 0; +} + //replacement of glibc scandir, to adapt dictator malloc wrap #define ENLARGE_STEP 1024 int my_scandir(const char *dir, struct dirent ***namelist, @@ -209,12 +230,15 @@ bool doris_read_table_file(struct doris_idxfile_scanner *scanner, struct cfg_tab { FILE *fp; size_t readlen, remainlen, oncesize; + MD5_CTX md5ctx; + char md5buffer[64]; if((fp = fopen(table->cfg_path, "r")) == NULL) { MESA_RUNTIME_LOGV4(logger,RLOG_LV_FATAL, "fopen table file %s failed: %s", table->cfg_path, strerror(errno)); return false; } + MD5_Init(&md5ctx); doris_cbs->cfgfile_start(NULL, table->table_name, table->filesize, table->cfg_num, doris_cbs->userdata); remainlen = table->filesize; @@ -225,8 +249,10 @@ bool doris_read_table_file(struct doris_idxfile_scanner *scanner, struct cfg_tab assert(readlen == oncesize); remainlen -= readlen; doris_cbs->cfgfile_update(NULL, scanner->oncebuf, readlen, doris_cbs->userdata); + MD5_Update(&md5ctx, scanner->oncebuf, readlen); } - doris_cbs->cfgfile_finish(NULL, doris_cbs->userdata); + scandir_md5_final_string(&md5ctx, md5buffer, 64); + doris_cbs->cfgfile_finish(NULL, md5buffer, doris_cbs->userdata); fclose(fp); return true; }