Commit 5f0b653
committed
fix: improve rollback handling logic
1. Modified ConfirmRollback to handle rollback synchronously instead of
in goroutine
2. Added Reboot field to ostreeRollbackData struct to track reboot
requirement
3. Implemented osTreeNeedRebootAfterRollback to properly determine
reboot need
4. Updated osTreeParseRollbackData to return additional field
information
5. Added slices package import for field checking
The changes improve rollback reliability by:
1. Making rollback operations synchronous to properly handle errors
2. Adding explicit reboot tracking instead of relying on auto-rollback
status
3. Maintaining backward compatibility with older ostree versions
4. Providing better field-level data access from ostree responses
fix: 改进回滚处理逻辑
1. 修改 ConfirmRollback 以同步方式处理回滚而非使用 goroutine
2. 在 ostreeRollbackData 结构体中添加 Reboot 字段以跟踪重启需求
3. 实现 osTreeNeedRebootAfterRollback 来正确判断是否需要重启
4. 更新 osTreeParseRollbackData 以返回额外的字段信息
5. 添加 slices 包导入用于字段检查
这些改进通过以下方式提高了回滚可靠性:
1. 同步执行回滚操作以正确处理错误
2. 添加显式的重启跟踪而非依赖自动回滚状态
3. 保持与旧版 ostree 的兼容性
4. 提供更好的字段级数据访问能力1 parent f3a7fab commit 5f0b653
2 files changed
Lines changed: 56 additions & 24 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
745 | 745 | | |
746 | 746 | | |
747 | 747 | | |
748 | | - | |
749 | | - | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
750 | 755 | | |
751 | 756 | | |
752 | 757 | | |
753 | | - | |
754 | | - | |
755 | | - | |
756 | | - | |
757 | | - | |
758 | | - | |
| 758 | + | |
759 | 759 | | |
760 | | - | |
761 | | - | |
762 | | - | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
763 | 764 | | |
764 | | - | |
| 765 | + | |
765 | 766 | | |
766 | 767 | | |
767 | 768 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
590 | 590 | | |
591 | 591 | | |
592 | 592 | | |
| 593 | + | |
593 | 594 | | |
594 | 595 | | |
595 | 596 | | |
| |||
623 | 624 | | |
624 | 625 | | |
625 | 626 | | |
626 | | - | |
| 627 | + | |
627 | 628 | | |
628 | 629 | | |
629 | 630 | | |
| |||
644 | 645 | | |
645 | 646 | | |
646 | 647 | | |
647 | | - | |
648 | | - | |
| 648 | + | |
| 649 | + | |
649 | 650 | | |
650 | | - | |
| 651 | + | |
651 | 652 | | |
652 | 653 | | |
653 | 654 | | |
654 | | - | |
| 655 | + | |
655 | 656 | | |
656 | 657 | | |
657 | 658 | | |
658 | | - | |
| 659 | + | |
659 | 660 | | |
660 | 661 | | |
661 | 662 | | |
662 | 663 | | |
663 | | - | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
664 | 670 | | |
665 | | - | |
| 671 | + | |
666 | 672 | | |
667 | 673 | | |
668 | | - | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
669 | 680 | | |
670 | 681 | | |
671 | | - | |
672 | | - | |
| 682 | + | |
| 683 | + | |
673 | 684 | | |
674 | 685 | | |
675 | 686 | | |
676 | | - | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
677 | 708 | | |
678 | 709 | | |
679 | 710 | | |
| |||
0 commit comments