yangxg 1 سال پیش
والد
کامیت
fa5babe9da

+ 2 - 2
redis-cluster/redis-cluster-creator/service/creator/startup.sh

@@ -23,10 +23,10 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   redis-cli -h 10.40.20.17 -p 6384 CLUSTER RESET
 
   sleep 5
-  echo "yes" | redis-cli --cluster create 10.40.20.17:6379 10.26.30.216:6380 10.26.30.216:6381 10.26.30.216:6382 10.26.30.216:6383 10.26.30.216:6384 --cluster-replicas 1
+  echo "yes" | redis-cli --cluster create 10.40.20.17:6379 10.40.20.17:6380 10.40.20.17:6381 10.40.20.17:6382 10.40.20.17:6383 10.40.20.17:6384 --cluster-replicas 1
   echo "create cluster end !"
 
-  redis-cli -c -h 10.26.30.216 -p 6379 cluster nodes
+  redis-cli -c -h 10.40.20.17 -p 6379 cluster nodes
   ###################  以上代码保证创建容器后只执行一次
   touch $FIRST_START_DONE
 fi

+ 5 - 5
redis-sentinel/redis/docker-compose.yml

@@ -56,20 +56,20 @@ services:
     container_name: redis-vipbook-queue-2
     ports:
       - '0.0.0.0:6681:6681'
-    command: redis-server --port 6681 --slaveof "10.40.20.17" 6680 --slave-announce-ip "10.26.30.216"
+    command: redis-server --port 6681 --slaveof "10.40.20.17" 6680 --slave-announce-ip "10.40.20.17"
   redis-vipbook-queue-3:
     image: redis:5.0.11
     restart: always
     container_name: redis-vipbook-queue-3
     ports:
       - '0.0.0.0:6682:6682'
-    command: redis-server --port 6682 --slaveof "10.26.30.216" 6680 --slave-announce-ip "10.26.30.216"
+    command: redis-server --port 6682 --slaveof "10.40.20.17" 6680 --slave-announce-ip "10.40.20.17"
 
   redis-community-queue-1:
     image: redis:5.0.11
     restart: always
     container_name: redis-community-queue-1
-    command: redis-server --port 6780 --slave-announce-ip "10.26.30.216"
+    command: redis-server --port 6780 --slave-announce-ip "10.40.20.17"
     ports:
       - '0.0.0.0:6780:6780'
   redis-community-queue-2:
@@ -78,11 +78,11 @@ services:
     container_name: redis-community-queue-2
     ports:
       - '0.0.0.0:6781:6781'
-    command: redis-server --port 6781 --slaveof "10.26.30.216" 6780 --slave-announce-ip "10.26.30.216"
+    command: redis-server --port 6781 --slaveof "10.40.20.17" 6780 --slave-announce-ip "10.40.20.17"
   redis-community-queue-3:
     image: redis:5.0.11
     restart: always
     container_name: redis-community-queue-3
     ports:
       - '0.0.0.0:6782:6782'
-    command: redis-server --port 6782 --slaveof "10.26.30.216" 6780 --slave-announce-ip "10.26.30.216"
+    command: redis-server --port 6782 --slaveof "10.40.20.17" 6780 --slave-announce-ip "10.40.20.17"

+ 14 - 14
redis-sentinel/sentinel/sentinel1.conf

@@ -36,22 +36,22 @@ sentinel down-after-milliseconds vipbook_queue 10000
 sentinel failover-timeout vipbook_queue 30000
 sentinel config-epoch vipbook_queue 9
 sentinel leader-epoch vipbook_queue 9
-sentinel known-replica vipbook_queue 10.26.30.216 6681
-sentinel known-replica vipbook_queue 10.26.30.216 6680
-sentinel known-sentinel vipbook_queue 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel vipbook_queue 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel known-sentinel vipbook_queue 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel vipbook_queue 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel monitor community_queue 10.26.30.216 6780 2
+sentinel known-replica vipbook_queue 10.40.20.17 6681
+sentinel known-replica vipbook_queue 10.40.20.17 6680
+sentinel known-sentinel vipbook_queue 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel known-sentinel vipbook_queue 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel known-sentinel vipbook_queue 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel vipbook_queue 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel monitor community_queue 10.40.20.17 6780 2
 sentinel down-after-milliseconds community_queue 10000
 sentinel failover-timeout community_queue 30000
 sentinel config-epoch community_queue 0
 sentinel leader-epoch community_queue 8
-sentinel known-replica community_queue 10.26.30.216 6782
-sentinel known-replica community_queue 10.26.30.216 6781
-sentinel known-sentinel community_queue 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel community_queue 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel known-sentinel community_queue 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel community_queue 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-replica community_queue 10.40.20.17 6782
+sentinel known-replica community_queue 10.40.20.17 6781
+sentinel known-sentinel community_queue 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel known-sentinel community_queue 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel known-sentinel community_queue 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel community_queue 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
 sentinel current-epoch 9
-sentinel announce-ip "10.26.30.216"
+sentinel announce-ip "10.40.20.17"

+ 13 - 13
redis-sentinel/sentinel/sentinel2.conf

@@ -37,21 +37,21 @@ sentinel failover-timeout vipbook_queue 30000
 sentinel config-epoch vipbook_queue 9
 sentinel leader-epoch vipbook_queue 9
 sentinel known-replica vipbook_queue 10.40.20.17 6680
-sentinel known-replica vipbook_queue 10.26.30.216 6681
-sentinel known-sentinel vipbook_queue 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel known-sentinel vipbook_queue 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel vipbook_queue 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel known-sentinel vipbook_queue 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel monitor master_assets 10.26.30.216 6580 2
+sentinel known-replica vipbook_queue 10.40.20.17 6681
+sentinel known-sentinel vipbook_queue 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-sentinel vipbook_queue 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel vipbook_queue 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel known-sentinel vipbook_queue 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel monitor master_assets 10.40.20.17 6580 2
 sentinel down-after-milliseconds master_assets 10000
 sentinel failover-timeout master_assets 30000
 sentinel config-epoch master_assets 0
 sentinel leader-epoch master_assets 8
-sentinel known-replica master_assets 10.26.30.216 6582
-sentinel known-replica master_assets 10.26.30.216 6581
-sentinel known-sentinel master_assets 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel known-sentinel master_assets 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel master_assets 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel known-sentinel master_assets 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel known-replica master_assets 10.40.20.17 6582
+sentinel known-replica master_assets 10.40.20.17 6581
+sentinel known-sentinel master_assets 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-sentinel master_assets 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel master_assets 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel known-sentinel master_assets 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
 sentinel current-epoch 9
-sentinel announce-ip "10.26.30.216"
+sentinel announce-ip "10.40.20.17"

+ 17 - 17
redis-sentinel/sentinel/sentinel3.conf

@@ -29,29 +29,29 @@ sentinel known-replica master_assets 10.40.20.17 6581
 sentinel known-replica master_assets 10.40.20.17 6582
 sentinel known-sentinel master_assets 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
 sentinel known-sentinel master_assets 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel master_assets 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel master_assets 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel monitor master_activity 10.26.30.216 6480 2
+sentinel known-sentinel master_assets 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel master_assets 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel monitor master_activity 10.40.20.17 6480 2
 sentinel down-after-milliseconds master_activity 10000
 sentinel failover-timeout master_activity 30000
 sentinel config-epoch master_activity 0
 sentinel leader-epoch master_activity 8
-sentinel known-replica master_activity 10.26.30.216 6481
-sentinel known-replica master_activity 10.26.30.216 6482
-sentinel known-sentinel master_activity 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel known-sentinel master_activity 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel master_activity 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel master_activity 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel monitor vipbook_queue 10.26.30.216 6682 2
+sentinel known-replica master_activity 10.40.20.17 6481
+sentinel known-replica master_activity 10.40.20.17 6482
+sentinel known-sentinel master_activity 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-sentinel master_activity 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel master_activity 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel master_activity 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel monitor vipbook_queue 10.40.20.17 6682 2
 sentinel down-after-milliseconds vipbook_queue 10000
 sentinel failover-timeout vipbook_queue 30000
 sentinel config-epoch vipbook_queue 9
 sentinel leader-epoch vipbook_queue 9
-sentinel known-replica vipbook_queue 10.26.30.216 6680
-sentinel known-replica vipbook_queue 10.26.30.216 6681
-sentinel known-sentinel vipbook_queue 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel known-sentinel vipbook_queue 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel vipbook_queue 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel vipbook_queue 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel known-replica vipbook_queue 10.40.20.17 6680
+sentinel known-replica vipbook_queue 10.40.20.17 6681
+sentinel known-sentinel vipbook_queue 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-sentinel vipbook_queue 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel vipbook_queue 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel vipbook_queue 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
 sentinel current-epoch 9
-sentinel announce-ip "10.26.30.216"
+sentinel announce-ip "10.40.20.17"

+ 17 - 17
redis-sentinel/sentinel/sentinel4.conf

@@ -29,29 +29,29 @@ sentinel known-replica vipbook_queue 10.40.20.17 6681
 sentinel known-replica vipbook_queue 10.40.20.17 6680
 sentinel known-sentinel vipbook_queue 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
 sentinel known-sentinel vipbook_queue 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel vipbook_queue 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel vipbook_queue 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel monitor master_assets 10.26.30.216 6580 2
+sentinel known-sentinel vipbook_queue 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel vipbook_queue 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel monitor master_assets 10.40.20.17 6580 2
 sentinel down-after-milliseconds master_assets 10000
 sentinel failover-timeout master_assets 30000
 sentinel config-epoch master_assets 0
 sentinel leader-epoch master_assets 8
-sentinel known-replica master_assets 10.26.30.216 6581
-sentinel known-replica master_assets 10.26.30.216 6582
-sentinel known-sentinel master_assets 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel master_assets 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel master_assets 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel master_assets 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
-sentinel monitor master_activity 10.26.30.216 6480 2
+sentinel known-replica master_assets 10.40.20.17 6581
+sentinel known-replica master_assets 10.40.20.17 6582
+sentinel known-sentinel master_assets 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel master_assets 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel known-sentinel master_assets 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel master_assets 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel monitor master_activity 10.40.20.17 6480 2
 sentinel down-after-milliseconds master_activity 10000
 sentinel failover-timeout master_activity 30000
 sentinel config-epoch master_activity 0
 sentinel leader-epoch master_activity 8
-sentinel known-replica master_activity 10.26.30.216 6482
-sentinel known-replica master_activity 10.26.30.216 6481
-sentinel known-sentinel master_activity 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel master_activity 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel master_activity 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel known-sentinel master_activity 10.26.30.216 26383 17f2628136cc86df187269ba624fe7b1cea4db58
+sentinel known-replica master_activity 10.40.20.17 6482
+sentinel known-replica master_activity 10.40.20.17 6481
+sentinel known-sentinel master_activity 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel master_activity 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel known-sentinel master_activity 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-sentinel master_activity 10.40.20.17 26383 17f2628136cc86df187269ba624fe7b1cea4db58
 sentinel current-epoch 9
-sentinel announce-ip "10.26.30.216"
+sentinel announce-ip "10.40.20.17"

+ 17 - 17
redis-sentinel/sentinel/sentinel5.conf

@@ -29,29 +29,29 @@ sentinel known-replica master_activity 10.40.20.17 6481
 sentinel known-replica master_activity 10.40.20.17 6482
 sentinel known-sentinel master_activity 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
 sentinel known-sentinel master_activity 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel master_activity 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel known-sentinel master_activity 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel monitor community_queue 10.26.30.216 6780 2
+sentinel known-sentinel master_activity 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-sentinel master_activity 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel monitor community_queue 10.40.20.17 6780 2
 sentinel down-after-milliseconds community_queue 10000
 sentinel failover-timeout community_queue 30000
 sentinel config-epoch community_queue 0
 sentinel leader-epoch community_queue 8
-sentinel known-replica community_queue 10.26.30.216 6782
-sentinel known-replica community_queue 10.26.30.216 6781
-sentinel known-sentinel community_queue 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel community_queue 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel community_queue 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel known-sentinel community_queue 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
-sentinel monitor master_assets 10.26.30.216 6580 2
+sentinel known-replica community_queue 10.40.20.17 6782
+sentinel known-replica community_queue 10.40.20.17 6781
+sentinel known-sentinel community_queue 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel community_queue 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel known-sentinel community_queue 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-sentinel community_queue 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel monitor master_assets 10.40.20.17 6580 2
 sentinel down-after-milliseconds master_assets 10000
 sentinel failover-timeout master_assets 30000
 sentinel config-epoch master_assets 0
 sentinel leader-epoch master_assets 8
-sentinel known-replica master_assets 10.26.30.216 6581
-sentinel known-replica master_assets 10.26.30.216 6582
-sentinel known-sentinel master_assets 10.26.30.216 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
-sentinel known-sentinel master_assets 10.26.30.216 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
-sentinel known-sentinel master_assets 10.26.30.216 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
-sentinel known-sentinel master_assets 10.26.30.216 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
+sentinel known-replica master_assets 10.40.20.17 6581
+sentinel known-replica master_assets 10.40.20.17 6582
+sentinel known-sentinel master_assets 10.40.20.17 26380 70ee80504e98483730bd0d2115905a7281ea8f9b
+sentinel known-sentinel master_assets 10.40.20.17 26381 1a9f2c501e12124857d29cff1290dbbd9a336638
+sentinel known-sentinel master_assets 10.40.20.17 26382 2e28940c244f39572173001852ccd5d5c2d3d4ab
+sentinel known-sentinel master_assets 10.40.20.17 26379 ad49d2327a23f21eccbc1838fb7458f2ee18234f
 sentinel current-epoch 9
-sentinel announce-ip "10.26.30.216"
+sentinel announce-ip "10.40.20.17"