TSG-5746 使用hos存储非结构化文件

修复缓存代码编译问题
缓存功能适配hos

1 files changed, 19 insertions, 36 deletions

diff --git a/conf/pangu/pangu_pxy.conf b/conf/pangu/pangu_pxy.conf
index aa5b6d4..f4ea6c6 100644
--- a/conf/pangu/pangu_pxy.conf
+++ b/conf/pangu/pangu_pxy.conf
@@ -5,32 +5,21 @@ enable_plugin=1
 entrance_id=0
 # default 1, if enable "en_sendlog", the iterm "tfe.conf [kafka] enable" must set 1
 en_sendlog=1
-#Addresses of minio. Format is defined by WiredLB.
-minio_ip_list=10.4.35.42-46;
-minio_listen_port=9000
-#Maximum number of connections opened by per host.
-#MAX_CONNECTION_PER_HOST=1
-#Maximum number of requests in a pipeline.
-#MAX_CNNT_PIPELINE_NUM=20
-#Maximum parellel sessions(http and redis) is allowed to open.
-#MAX_CURL_SESSION_NUM=100
-#Maximum time the request is allowed to take(seconds).
-#MAX_CURL_TRANSFER_TIMEOUT_S=0
 
-#Bucket name in minio.
+#Addresses of hos, Bucket name in hos. Format is defined by WiredLB.
+cache_ip_list=10.4.35.42-46;
+cache_listen_port=9000
 cache_bucket_name=proxybucket
-#Maximum size of memory used by tango_cache_client. Upload will fail if the current size of memory used exceeds this value.
+cache_token=c21f969b5f03d33d43e04f8f136e7682
+
+#Refer to the pangu_cahche definition
 max_used_memroy_size_mb=5120
-#Default TTL of objects, i.e. the time after which the object will expire(minumun 60s, i.e. 1 minute).
 cache_default_ttl_second=3600
-#Whether to hash the object key before cache actions. GET/PUT may be faster if you open it.
 cache_object_key_hash_switch=1
 
-#Store way: 0-MINIO; 1-META in REDIS, object in minio; 2-META and small object in Redis, large object in minio;
-cache_store_object_way=2
-#If CACHE_STORE_OBJECT_WAY is 2 and the size of a object is not bigger than this value, object will be stored in redis.
+#Refer to the pangu_cahche definition
+cache_store_object_way=0
 redis_cache_object_size=1024000
-#If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object.
 redis_cluster_addrs=10.4.20.211:9001,10.4.20.212:9001,10.4.20.213:9001,10.4.20.214:9001,10.4.20.215:9001,10.4.20.216:9001,10.4.20.217:9001,10.4.20.218:9001
 
 #Configs of WiredLB for Minios load balancer.
@@ -49,6 +38,7 @@ log_fsstat_dst_ip=10.4.20.202
 log_fsstat_dst_port=8125
 
 [ratelimit]
+#hijack flow control
 enable=0
 token_name=ratelimit
 redis_server=192.168.40.137
@@ -56,35 +46,28 @@ redis_port=6379
 redis_db_index=5
 
 [tango_cache]
-enable_cache=1
+enable_cache=0
 min_cache_obj_size=512
-#minio ip, as wiredlb required
-minio_ip_list=10.4.35.1-14;
-minio_listen_port=9000
+#hos ip, as wiredlb required
+cache_ip_list=10.4.35.1-14;
+cache_listen_port=9000
+cache_bucket_name=proxybucket
 
-#max_connection_per_host=1
 max_cnnt_pipeline_num=20
-#max_curl_session_num=100
-
-cache_bucket_name=proxybucket
+#Maximum size of memory used by tango_cache_client. Upload will fail if the current size of memory used exceeds this value.
 max_used_memory_size_mb=10240
+#Default TTL of objects, i.e. the time after which the object will expire(minumun 60s, i.e. 1 minute).
 cache_default_ttl_second=3600
+#Whether to hash the object key before cache actions. GET/PUT may be faster if you open it.
 cache_object_key_hash_switch=1
-
-#1-minio，2-redis
-#Store way: 0-MINIO; 1-META in REDIS, object in minio; 2-META and small object in Redis, large object in minio;
+#Store way: 0-HOS; 1-META in REDIS, object in hos; 2-META and small object in Redis, large object in hos;
 cache_store_object_way=2
 #If CACHE_STORE_OBJECT_WAY is 2 and the size of a object is not bigger than this value, object will be stored in redis.
 redis_cache_object_size=102400
 #If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object.
 redis_cluster_addrs=10.4.35.15:9001,10.4.35.16:9001,10.4.35.17:9001,10.4.35.18:9001,10.4.35.19:9001,10.4.35.20:9001,10.4.35.21:9001,10.4.35.22:9001,10.4.35.23:9001,10.4.35.24:9001,10.4.35.25:9001,10.4.35.26:9001,10.4.35.27:9001,10.4.35.28:9001,10.4.35.29:9001,10.4.35.30:9001,10.4.35.31:9001,10.4.35.32:9001
 
-#wired load balancer configuration
-#wiredlb_override=1
-#wiredlb_topic=
-#wiredlb_datacenter=
-wiredlb_health_port=52100
-#wiredlb_group=
+#Configs of WiredLB for Minios load balancer.Refer to the definition at log
 
 cache_undefined_obj=1
 query_undefined_obj=0