Merge branch 'peer' of https://code.wuban.net.cn/cmpchain/metadeploy into peer

host/docker-compose-sender.yml

@@ -13,22 +13,14 @@ services:
     volumes:
       - ./cryptor/config.toml:/root/config.toml 
   sender: 
-    image: caduceus/cmp2-test-net-tester:v0.0.12-10
+    image: caduceus/cmp2-test-net-tester:v0.0.12-12
     container_name: sender
-    entrypoint:  sh -c 'echo +sender+ && sender  -test.run TestManyToMany  /privatefromto-100_000.tmp 192.168.1.220  cryptor-sender 5000 0 50000 >> /sender/sender.log  2>&1 ' 
+    entrypoint:  sh -c 'echo +sender+ && sender  -test.run TestManyToMany  /privatefromto-100_000.tmp 192.168.1.220  192.168.1.10  100000 0 50000 >> /sender/sender.log  2>&1 ' 
     #entrypoint: sh -c 'sender  -test.run TestManyToMany -test.timeout 0  /privatefromto-10_000.tmp  192.168.1.220  cryptor-sender 30000'
     #echo "    entrypoint: sh -c 'echo "+"ring"+" && sleep 10 && sender  -test.run TestManyToMany -test.timeout 0  "
     #entrypoint: sh -c 'echo "sender" && sleep 40 && go test  -v -run TestSendSignatureTxsStream   ./rpc/grpc/  --timeout 0 -args  ring  192.168.1.242  100000'
     ports:
       - "2115:2115"   
-    deploy:
-      resources:
-        limits:
-          cpus: "36.00"
-          memory: 32G
-        reservations:
-          cpus: "30.00"
-          memory: 32G
     volumes:
       - ./sender/sender:/sender/             
     depends_on:                      
@@ -37,7 +29,7 @@ services:
     image: google/cadvisor:latest
     container_name: cadvisor-sender
     ports:
-      - "8080:8080"
+      - "8081:8080"
     volumes:
       - /:/rootfs:ro
       - /var/run:/var/run:rw

host/host.sh

@@ -357,6 +357,15 @@ echo "sleep 10"                                      >> $startfile
 fi 
 echo "docker compose -f  "$composefile"  up    -d"  >> $startfile
 
+# while [ ! -e "$file_path" ]; do
+  #    echo "文件不存在，等待中..."
+  #    sleep 1  # 可以调整等待的时间间隔，单位为秒
+  #done
+
+echo "while [ ! -e $datadir/net/$i/peer-id ];do" >> $startfile
+echo "  echo \"waiting for $i peer-id\"">> $startfile
+echo "  sleep 1"                                     >> $startfile
+echo "done"                                          >> $startfile
 
 echo "ip=\$(cat $datadir/net/$i/config.yaml | grep "p2p-host-ip"|  grep -o '\".*\"'  | sed 's/[\"\"]//g') "  >> $startfile
 #echo "echo \$ip"                                       >> $startfile