比较文本

查找两个文本文件之间的差异

实时差异

统一差异

折叠行

高亮显示更改

语法高亮

工具

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 7 years agoDiff never expires

行
总计
删除

单词
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

59 行

行
总计
添加

单词
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

61 行

Running command: dd if=/dev/zero of=/dev/sdc bs=1M count=10

stderr: 10+0 records in

10+0 records out

10485760 bytes (10 MB) copied

stderr: , 0.0150312 s, 698 MB/s

stderr: , 0.0121229 s, 865 MB/s

--> Zapping successful for: /dev/sdc

Preparing cached /dev/sdc for bluestore with

Zapping cache

--> KeyError: 'ceph.cluster_name'

--> Zapping: /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal

--> KeyError: 'ceph.cluster_name'

--> Zapping: /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db

Creating volume with cache

Running command: /bin/ceph-authtool --gen-print-key

Running command: /bin/ceph --cluster ceph --name client.bootstrap-osd --keyring /var/lib/ceph/bootstrap-osd/ceph.keyring -i - osd new ed5a15e8-20b9-4312-991c-1a4d91b284bd

Running command: vgcreate --force --yes ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655 /dev/sdc

Running command: vgcreate --force --yes ceph-eae96680-c60f-4593-adfb-9ead9e1b4434 /dev/sdc

stdout: Physical volume "/dev/sdc" successfully created.

stdout: Volume group "ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655" successfully created

stdout: Volume group "ceph-eae96680-c60f-4593-adfb-9ead9e1b4434" successfully created

Running command: lvcreate --yes -l 100%FREE -n osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655

Running command: lvcreate --yes -l 100%FREE -n osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd ceph-eae96680-c60f-4593-adfb-9ead9e1b4434

stdout: Logical volume "osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd" created.

Running command: /bin/ceph-authtool --gen-print-key

Running command: mount -t tmpfs tmpfs /var/lib/ceph/osd/ceph-5

Running command: chown -h ceph:ceph /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd

Running command: chown -h ceph:ceph /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd

Running command: chown -R ceph:ceph /dev/mapper/ceph--86770ee7--d0b9--4d84--b89d--81cb32a54655-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd

Running command: chown -R ceph:ceph /dev/mapper/ceph--eae96680--c60f--4593--adfb--9ead9e1b4434-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd

Running command: ln -s /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block

Running command: ln -s /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block

Running command: ceph --cluster ceph --name client.bootstrap-osd --keyring /var/lib/ceph/bootstrap-osd/ceph.keyring mon getmap -o /var/lib/ceph/osd/ceph-5/activate.monmap

stderr: got monmap epoch 3

Running command: ceph-authtool /var/lib/ceph/osd/ceph-5/keyring --create-keyring --name osd.5 --add-key AQD0T2hbEax/MhAAyvbO6GrftF1dOAAH2YpB+w==

Running command: ceph-authtool /var/lib/ceph/osd/ceph-5/keyring --create-keyring --name osd.5 --add-key AQDFfmhbuKScKxAAbq7pRlqld1vE7gTQ5QYN0A==

stdout: creating /var/lib/ceph/osd/ceph-5/keyring

stdout: added entity osd.5 auth auth(auid = 18446744073709551615 key=AQD0T2hbEax/MhAAyvbO6GrftF1dOAAH2YpB+w== with 0 caps)

stdout: added entity osd.5 auth auth(auid = 18446744073709551615 key=AQDFfmhbuKScKxAAbq7pRlqld1vE7gTQ5QYN0A== with 0 caps)

Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5/keyring

Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5/

Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal

Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--wal

Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db

Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db

Running command: /bin/ceph-osd --cluster ceph --osd-objectstore bluestore --mkfs -i 5 --monmap /var/lib/ceph/osd/ceph-5/activate.monmap --keyfile - --bluestore-block-wal-path /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal --bluestore-block-db-path /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db --osd-data /var/lib/ceph/osd/ceph-5/ --osd-uuid ed5a15e8-20b9-4312-991c-1a4d91b284bd --setuser ceph --setgroup ceph

--> ceph-volume lvm prepare successful for: /dev/sdc

Starting OSD service

Running command: ceph-bluestore-tool --cluster=ceph prime-osd-dir --dev /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd --path /var/lib/ceph/osd/ceph-5

Running command: ceph-bluestore-tool --cluster=ceph prime-osd-dir --dev /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd --path /var/lib/ceph/osd/ceph-5

Running command: ln -snf /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block

Running command: ln -snf /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block

Running command: chown -h ceph:ceph /var/lib/ceph/osd/ceph-5/block

Running command: chown -R ceph:ceph /dev/mapper/ceph--86770ee7--d0b9--4d84--b89d--81cb32a54655-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd

Running command: chown -R ceph:ceph /dev/mapper/ceph--eae96680--c60f--4593--adfb--9ead9e1b4434-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd

Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5

Running command: ln -snf /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db /var/lib/ceph/osd/ceph-5/block.db

Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db

Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db

Running command: chown -h ceph:ceph /var/lib/ceph/osd/ceph-5/block.db

Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db

Running command: ln -snf /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal /var/lib/ceph/osd/ceph-5/block.wal

Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal

Running command: systemctl enable ceph-volume@lvm-5-ed5a15e8-20b9-4312-991c-1a4d91b284bd

stderr: Created symlink /etc/systemd/system/multi-user.target.wants/ceph-volume@lvm-5-ed5a15e8-20b9-4312-991c-1a4d91b284bd.service, pointing to /usr/lib/systemd/system/ceph-volume@.service.

Running command: systemctl start ceph-osd@5

stderr: Running in chroot, ignoring request.

--> ceph-volume lvm activate successful for osd ID: 5

osd.5 belongs to no class,

set osd(s) 5 to class 'b4a41f55-6843-4e03-9c4f-2f4c803bde75'

OSD ID 5 for device : /dev/sdc , UUID: ed5a15e8-20b9-4312-991c-1a4d91b284bd

starting osd.5 at - osd_data /var/lib/ceph/osd/ceph-5 /var/lib/ceph/osd/ceph-5/journal

已保存差异

原始文本

打开文件

Running command: dd if=/dev/zero of=/dev/sdc bs=1M count=10
 stderr: 10+0 records in
10+0 records out
10485760 bytes (10 MB) copied
 stderr: , 0.0150312 s, 698 MB/s
--> Zapping successful for: /dev/sdc
Preparing cached /dev/sdc for bluestore with
Zapping cache
-->  KeyError: 'ceph.cluster_name'
--> Zapping: /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal
-->  KeyError: 'ceph.cluster_name'
--> Zapping: /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db
Creating volume with cache
Running command: /bin/ceph-authtool --gen-print-key
Running command: /bin/ceph --cluster ceph --name client.bootstrap-osd --keyring /var/lib/ceph/bootstrap-osd/ceph.keyring -i - osd new ed5a15e8-20b9-4312-991c-1a4d91b284bd
Running command: vgcreate --force --yes ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655 /dev/sdc
 stdout: Physical volume "/dev/sdc" successfully created.
 stdout: Volume group "ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655" successfully created
Running command: lvcreate --yes -l 100%FREE -n osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655
 stdout: Logical volume "osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd" created.
Running command: /bin/ceph-authtool --gen-print-key
Running command: mount -t tmpfs tmpfs /var/lib/ceph/osd/ceph-5
Running command: chown -h ceph:ceph /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd
Running command: chown -R ceph:ceph /dev/mapper/ceph--86770ee7--d0b9--4d84--b89d--81cb32a54655-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd
Running command: ln -s /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block
Running command: ceph --cluster ceph --name client.bootstrap-osd --keyring /var/lib/ceph/bootstrap-osd/ceph.keyring mon getmap -o /var/lib/ceph/osd/ceph-5/activate.monmap
 stderr: got monmap epoch 3
Running command: ceph-authtool /var/lib/ceph/osd/ceph-5/keyring --create-keyring --name osd.5 --add-key AQD0T2hbEax/MhAAyvbO6GrftF1dOAAH2YpB+w==
 stdout: creating /var/lib/ceph/osd/ceph-5/keyring
 stdout: added entity osd.5 auth auth(auid = 18446744073709551615 key=AQD0T2hbEax/MhAAyvbO6GrftF1dOAAH2YpB+w== with 0 caps)
Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5/keyring
Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5/
Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--wal
Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db
Running command: /bin/ceph-osd --cluster ceph --osd-objectstore bluestore --mkfs -i 5 --monmap /var/lib/ceph/osd/ceph-5/activate.monmap --keyfile - --bluestore-block-wal-path /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal --bluestore-block-db-path /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db --osd-data /var/lib/ceph/osd/ceph-5/ --osd-uuid ed5a15e8-20b9-4312-991c-1a4d91b284bd --setuser ceph --setgroup ceph
--> ceph-volume lvm prepare successful for: /dev/sdc
Starting OSD service 
Running command: ceph-bluestore-tool --cluster=ceph prime-osd-dir --dev /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd --path /var/lib/ceph/osd/ceph-5
Running command: ln -snf /dev/ceph-86770ee7-d0b9-4d84-b89d-81cb32a54655/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block
Running command: chown -h ceph:ceph /var/lib/ceph/osd/ceph-5/block
Running command: chown -R ceph:ceph /dev/mapper/ceph--86770ee7--d0b9--4d84--b89d--81cb32a54655-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd
Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5
Running command: ln -snf /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db /var/lib/ceph/osd/ceph-5/block.db
Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db
Running command: chown -h ceph:ceph /var/lib/ceph/osd/ceph-5/block.db
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db
Running command: systemctl enable ceph-volume@lvm-5-ed5a15e8-20b9-4312-991c-1a4d91b284bd
 stderr: Created symlink /etc/systemd/system/multi-user.target.wants/ceph-volume@lvm-5-ed5a15e8-20b9-4312-991c-1a4d91b284bd.service, pointing to /usr/lib/systemd/system/ceph-volume@.service.
Running command: systemctl start ceph-osd@5
 stderr: Running in chroot, ignoring request.
--> ceph-volume lvm activate successful for osd ID: 5
osd.5 belongs to no class, 
set osd(s) 5 to class 'b4a41f55-6843-4e03-9c4f-2f4c803bde75'
OSD ID 5 for device : /dev/sdc , UUID: ed5a15e8-20b9-4312-991c-1a4d91b284bd
starting osd.5 at - osd_data /var/lib/ceph/osd/ceph-5 /var/lib/ceph/osd/ceph-5/journal

更改后文本

打开文件

Running command: dd if=/dev/zero of=/dev/sdc bs=1M count=10
 stderr: 10+0 records in
10+0 records out
10485760 bytes (10 MB) copied
 stderr: , 0.0121229 s, 865 MB/s
--> Zapping successful for: /dev/sdc
Preparing cached /dev/sdc for bluestore with 
Zapping cache
-->  KeyError: 'ceph.cluster_name'
--> Zapping: /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal
-->  KeyError: 'ceph.cluster_name'
--> Zapping: /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db
Creating volume with cache
Running command: /bin/ceph-authtool --gen-print-key
Running command: /bin/ceph --cluster ceph --name client.bootstrap-osd --keyring /var/lib/ceph/bootstrap-osd/ceph.keyring -i - osd new ed5a15e8-20b9-4312-991c-1a4d91b284bd
Running command: vgcreate --force --yes ceph-eae96680-c60f-4593-adfb-9ead9e1b4434 /dev/sdc
 stdout: Physical volume "/dev/sdc" successfully created.
 stdout: Volume group "ceph-eae96680-c60f-4593-adfb-9ead9e1b4434" successfully created
Running command: lvcreate --yes -l 100%FREE -n osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd ceph-eae96680-c60f-4593-adfb-9ead9e1b4434
 stdout: Logical volume "osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd" created.
Running command: /bin/ceph-authtool --gen-print-key
Running command: mount -t tmpfs tmpfs /var/lib/ceph/osd/ceph-5
Running command: chown -h ceph:ceph /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd
Running command: chown -R ceph:ceph /dev/mapper/ceph--eae96680--c60f--4593--adfb--9ead9e1b4434-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd
Running command: ln -s /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block
Running command: ceph --cluster ceph --name client.bootstrap-osd --keyring /var/lib/ceph/bootstrap-osd/ceph.keyring mon getmap -o /var/lib/ceph/osd/ceph-5/activate.monmap
 stderr: got monmap epoch 3
Running command: ceph-authtool /var/lib/ceph/osd/ceph-5/keyring --create-keyring --name osd.5 --add-key AQDFfmhbuKScKxAAbq7pRlqld1vE7gTQ5QYN0A==
 stdout: creating /var/lib/ceph/osd/ceph-5/keyring
 stdout: added entity osd.5 auth auth(auid = 18446744073709551615 key=AQDFfmhbuKScKxAAbq7pRlqld1vE7gTQ5QYN0A== with 0 caps)
Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5/keyring
Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5/
Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--wal
Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db
Running command: /bin/ceph-osd --cluster ceph --osd-objectstore bluestore --mkfs -i 5 --monmap /var/lib/ceph/osd/ceph-5/activate.monmap --keyfile - --bluestore-block-wal-path /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal --bluestore-block-db-path /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db --osd-data /var/lib/ceph/osd/ceph-5/ --osd-uuid ed5a15e8-20b9-4312-991c-1a4d91b284bd --setuser ceph --setgroup ceph
--> ceph-volume lvm prepare successful for: /dev/sdc
Starting OSD service 
Running command: ceph-bluestore-tool --cluster=ceph prime-osd-dir --dev /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd --path /var/lib/ceph/osd/ceph-5
Running command: ln -snf /dev/ceph-eae96680-c60f-4593-adfb-9ead9e1b4434/osd-block-ed5a15e8-20b9-4312-991c-1a4d91b284bd /var/lib/ceph/osd/ceph-5/block
Running command: chown -h ceph:ceph /var/lib/ceph/osd/ceph-5/block
Running command: chown -R ceph:ceph /dev/mapper/ceph--eae96680--c60f--4593--adfb--9ead9e1b4434-osd--block--ed5a15e8--20b9--4312--991c--1a4d91b284bd
Running command: chown -R ceph:ceph /var/lib/ceph/osd/ceph-5
Running command: ln -snf /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db /var/lib/ceph/osd/ceph-5/block.db
Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-db
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db
Running command: chown -h ceph:ceph /var/lib/ceph/osd/ceph-5/block.db
Running command: chown -R ceph:ceph /dev/mapper/inaugurator-ed5a15e8--20b9--4312--991c--1a4d91b284bd--db
Running command: ln -snf /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal /var/lib/ceph/osd/ceph-5/block.wal
Running command: chown -h ceph:ceph /dev/inaugurator/ed5a15e8-20b9-4312-991c-1a4d91b284bd-wal
Running command: systemctl enable ceph-volume@lvm-5-ed5a15e8-20b9-4312-991c-1a4d91b284bd
 stderr: Created symlink /etc/systemd/system/multi-user.target.wants/ceph-volume@lvm-5-ed5a15e8-20b9-4312-991c-1a4d91b284bd.service, pointing to /usr/lib/systemd/system/ceph-volume@.service.
Running command: systemctl start ceph-osd@5
 stderr: Running in chroot, ignoring request.
--> ceph-volume lvm activate successful for osd ID: 5
osd.5 belongs to no class, 
set osd(s) 5 to class 'b4a41f55-6843-4e03-9c4f-2f4c803bde75'
OSD ID 5 for device : /dev/sdc , UUID: ed5a15e8-20b9-4312-991c-1a4d91b284bd
starting osd.5 at - osd_data /var/lib/ceph/osd/ceph-5 /var/lib/ceph/osd/ceph-5/journal