This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt to use one of the following tools: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare emerge vimdiff
[root@node2 zookeeper]# du -h --max-dept=1 294G ./version-2 294G .
使用自带的zkCleanup进行清理
1 2 3 4 5 6
./zkCleanup.sh Usage: PurgeTxnLog dataLogDir [snapDir] -n count dataLogDir -- path to the txn log directory snapDir -- path to the snapshot directory count -- the number of old snaps/logs you want to keep, value should be greater than or equal to 3
# The number of snapshots to retain in dataDir autopurge.snapRetainCount=3 # Purge task interval in hours # Set to "0" to disable auto purge feature autopurge.purgeInterval=1
... ... downloads 1 p STARTED 641603 24.2gb 192.168.1.92 node-2 downloads 1 r INITIALIZING 192.168.1.93 node-3 downloads 2 r INITIALIZING 192.168.1.92 node-2 downloads 2 p STARTED 641049 26.5gb 192.168.1.93 node-3 downloads 3 r INITIALIZING 192.168.1.91 node-1 downloads 3 p STARTED 639813 26.3gb 192.168.1.93 node-3 downloads 4 r INITIALIZING 192.168.1.91 node-1 downloads 4 p STARTED 642036 26.1gb 192.168.1.93 node-3 downloads 0 r INITIALIZING 192.168.1.92 node-2 downloads 0 p STARTED 640368 25.6gb 192.168.1.93 node-3 ... ...
... ... downloads 1 p STARTED 641603 24.2gb 192.168.1.92 node-2 downloads 2 p RELOCATING 641049 26.5gb 192.168.1.93 node-3 -> 192.168.1.92 MNskHyFsQfC0PixAx-3hBQ node-2 downloads 3 p STARTED 639813 26.3gb 192.168.1.93 node-3 downloads 4 p STARTED 642036 26.1gb 192.168.1.93 node-3 downloads 0 p RELOCATING 640368 25.6gb 192.168.1.93 node-3 -> 192.168.1.91 pkjX2YIbTnm3A49re8COPg node-1 ...
ES将逐个分片进行迁移
1 2 3 4 5
downloads 1 p STARTED 641603 24.2gb 192.168.1.92 node-2 downloads 2 p RELOCATING 641049 26.5gb 192.168.1.93 node-3 -> 192.168.1.92 MNskHyFsQfC0PixAx-3hBQ node-2 downloads 3 p STARTED 639813 26.3gb 192.168.1.93 node-3 downloads 4 p STARTED 642036 26.1gb 192.168.1.93 node-3 downloads 0 p STARTED 640368 25.6gb 192.168.1.91 node-1
... ... downloads 1 p STARTED 641603 24.2gb 192.168.1.92 node-2 downloads 1 r INITIALIZING 192.168.1.91 node-1 downloads 2 p STARTED 641049 26.5gb 192.168.1.92 node-2 downloads 2 r INITIALIZING 192.168.1.93 node-3 downloads 3 r INITIALIZING 192.168.1.92 node-2 downloads 3 p STARTED 639813 26.3gb 192.168.1.93 node-3 downloads 4 r INITIALIZING 192.168.1.91 node-1 downloads 4 p STARTED 642036 26.1gb 192.168.1.93 node-3 downloads 0 p STARTED 640368 25.6gb 192.168.1.91 node-1 downloads 0 r INITIALIZING 192.168.1.93 node-3 ... ...
TOR 和 I2P 的相同点在于: 都是经过若干个网络节点来加密和中转数据,并防止你的真实 IP 暴露。
两者的差别在于:
TOR 使用【同一条网络链路】实现数据的发送和接收;
I2P 使用【多条网络链路】发送数据和接受数据——并且发送和接收数据的链路,数量可以是不同的。
抗封杀
在抗封杀方面,I2P 比 TOR 要坚挺。
TOR 每次启动时,需要先连接到某个 TOR 的目录服务器,获取网络上可用节点的信息。由于目录服务器数量有限,GFW 就把互联网上所有的 TOR 目录服务器的 IP 地址都列入黑名单。后来,TOR 官网提供网桥中继,帮助网友接入 TOR 网络。但是TOR 的网桥中继,数量依然不太多。据说 GFW 专门有人在盯着 TOR 官网更新的网桥中继地址——每次有新的中继地址贴出来,就列入黑名单。经过 GFW 的不懈努力,大部分 TOR 的网桥都被封杀。所以最近2年,TOR 在天朝内不太好使。
I2P 为啥封杀不了: I2P 使用 Kad 算法(用过电驴或电骡的网友,应该听说过)来获取网络节点的信息。这么做有几个好处: