laumann/pijul - Change 5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC

Cleanup (debugging a crash related to trees/inodes)

Created by pmeunier on December 2, 2020

5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC

Dependencies

In channels

main

Change contents

Deletion in pijul/src/commands/debug.rs at line 3 [5.177758]
B:BD[4.2737] → [4.2737:2753]
B:BD[4.2753] → [6.5642:5662]
∅:D[6.5662] → [4.2753:2754]
B:BD[4.2753] → [4.2753:2754]
```
use clap::Clap;
use libpijul::TxnT;
```
Insertion in pijul/src/commands/debug.rs at line 5 [5.177758]
[5.177812]
[5.177836]
```
use clap::Clap;
use libpijul::{Base32, TxnT};
use log::debug;
```
Insertion in pijul/src/commands/debug.rs at line 22 [5.177758]
[6.5711]
[6.5711]
```
        libpijul::pristine::debug_revinodes(&txn);
```

Insertion in pijul/src/commands/debug.rs at line 25 [5.177758]

[6.5818]

[5.178214]

        let c: libpijul::ChangeId = libpijul::ChangeId::from_base32(b"L4ITS7QS3M4P6").unwrap();
        debug!("{:?}", txn.get_external(c));

Replacement in pijul/Cargo.toml at line 4 [5.196374]
B:BD[5.196462] → [2.0:26]
```
version = "1.0.0-alpha.8"
```
[5.196462]
[5.196488]
```
version = "1.0.0-alpha.11"
```

Replacement in pijul/Cargo.toml at line 49 [5.196374]

B:BD[5.197456] → [2.27:94]

libpijul = { version = "1.0.0-alpha.6", features = [ "tarball" ] }

[5.197456]

[5.197523]

libpijul = { version = "1.0.0-alpha.7", features = [ "tarball" ] }

Replacement in libpijul/src/unrecord/working_copy.rs at line 17 [5.225940]

B:BD[5.226518] → [5.226518:226645]

            let inode = inode.to_owned();
            txn.del_revinodes(pos, None)?;
            txn.del_inodes(inode, None)?;

[5.226518]

[5.226645]

            del_inodes_with_rev(txn, inode, pos)?;

Replacement in libpijul/src/unrecord/working_copy.rs at line 98 [5.225940]

B:BD[7.152] → [7.152:259]

        txn.put_tree(file_id.as_file_id(), inode)?;
        txn.put_revtree(inode, file_id.as_file_id())?;

[7.152]

[3.1571]

        put_tree_with_rev(txn, file_id.as_file_id(), inode)?;

Replacement in libpijul/src/unrecord/working_copy.rs at line 149 [5.225940]

B:BD[5.231296] → [5.231296:231440]

                let inode = inode.to_owned();
                txn.del_revinodes(position, None)?;
                txn.del_inodes(inode, None)?;

[5.231296]

[5.231440]

                del_inodes_with_rev(txn, inode, position)?;

Deletion in libpijul/src/record.rs at line 179 [5.488880]

B:BD[5.494753] → [5.494753:495140]

                    }
                    Ok(None) => continue,
                    Err(_) => {
                        let parent = txn.get_revtree(item.inode, None).unwrap().to_owned();
                        info!("recursively deleting {:?} {:?}", parent, item.inode);
                        crate::fs::rec_delete(txn, parent, item.inode, false)?;
                        continue;

Insertion in libpijul/src/record.rs at line 180 [5.488880]
[5.495162]
[5.495162]
```
                    _ => continue,
```
Insertion in libpijul/src/pristine/sanakirja.rs at line 421 [5.531056]
[5.545544]
[5.545544]
```
    type Revinodes = Db<Position<ChangeId>, Inode>;
```
Deletion in libpijul/src/pristine/sanakirja.rs at line 424 [5.531056]
B:BD[5.545669] → [5.545669:545701]
```
    // #[cfg(debug_assertions)]
```

Insertion in libpijul/src/pristine/sanakirja.rs at line 425 [5.531056]

[5.545759]

    #[cfg(debug_assertions)]
    sanakirja_cursor!(revinodes, Position<ChangeId>, Inode);

Deletion in libpijul/src/pristine/sanakirja.rs at line 635 [5.531056]
B:BD[5.552961] → [5.552961:552993]
B:BD[5.552993] → [6.36949:36950]
```
    // #[cfg(debug_assertions)]
```

Insertion in libpijul/src/pristine/sanakirja.rs at line 641 [5.531056]

[5.553202]

[5.553221]

    #[cfg(debug_assertions)]
    fn iter_revinodes<'txn>(
        &'txn self,
    ) -> super::Cursor<Self, &'txn Self, Self::RevinodesCursor, Position<ChangeId>, Inode> {
        self.cursor_revinodes(&self.revinodes, None)
    }

Insertion in libpijul/src/pristine/mod.rs at line 141 [5.586748]
[5.589844]
[5.589844]
```
    table!(revinodes);
```
Deletion in libpijul/src/pristine/mod.rs at line 260 [5.586748]
B:BD[6.36994] → [6.36994:37026]
```
    // #[cfg(debug_assertions)]
```
Deletion in libpijul/src/pristine/mod.rs at line 261 [5.586748]
B:BD[6.37074] → [6.37074:37139]
```
    #[cfg(not(debug_assertions))]
    fn debug_inodes(&self) {}
```

Insertion in libpijul/src/pristine/mod.rs at line 264 [5.586748]

[6.37267]


    #[cfg(debug_assertions)]
    cursor!(revinodes, Position<ChangeId>, Inode);
    #[cfg(debug_assertions)]
    fn iter_revinodes<'txn>(
        &'txn self,
    ) -> Cursor<Self, &'txn Self, Self::RevinodesCursor, Position<ChangeId>, Inode>;

Insertion in libpijul/src/pristine/mod.rs at line 562 [5.586748]

[5.611728]

[6.45204]

#[cfg(debug_assertions)]
pub fn debug_revinodes<T: TxnT>(txn: &T) {
    debug!("debug_revinodes");
    for t in txn.iter_revinodes() {
        debug!("debug_revinodes = {:?}", t)
    }
    debug!("/debug_revinodes");
}

Deletion in libpijul/src/pristine/mod.rs at line 866 [5.586748]
B:BD[5.621464] → [5.621464:621492]
```
// #[cfg(debug_assertions)]
```

Insertion in libpijul/src/pristine/mod.rs at line 867 [5.586748]

[5.621548]

#[cfg(debug_assertions)]
initialized_cursor!(revinodes, Position<ChangeId>, Inode);

Insertion in libpijul/src/pristine/mod.rs at line 1146 [5.586748]

[6.50319]

    Ok(())
}
pub(crate) fn del_inodes_with_rev<T: MutTxnT>(
    txn: &mut T,
    inode: Inode,
    position: Position<ChangeId>,
) -> Result<bool, anyhow::Error> {
    if txn.del_inodes(inode, Some(position))? {
        assert!(txn.del_revinodes(position, Some(inode))?);
        Ok(true)
    } else {
        Ok(false)
    }
}
pub(crate) fn put_tree_with_rev<T: MutTxnT>(
    txn: &mut T,
    file_id: PathId,
    inode: Inode,
) -> Result<(), anyhow::Error> {
    txn.put_tree(file_id, inode)?;
    txn.put_revtree(inode, file_id)?;

Insertion in libpijul/src/pristine/mod.rs at line 1172 [5.586748]

[6.50333]

pub(crate) fn del_tree_with_rev<T: MutTxnT>(
    txn: &mut T,
    file_id: PathId,
    inode: Inode,
) -> Result<bool, anyhow::Error> {
    if txn.del_tree(file_id, Some(inode))? {
        if !file_id.basename.is_empty() {
            assert!(txn.del_revtree(inode, Some(file_id))?);
        }
        Ok(true)
    } else {
        Ok(false)
    }
}

Replacement in libpijul/src/output/output.rs at line 238 [5.671807]

B:BD[5.680701] → [5.680701:680852]

                assert!(txn.del_revtree(inode, Some(parent.as_file_id()))?);
                assert!(txn.del_tree(parent.as_file_id(), Some(inode))?);

[5.680701]

[5.680852]

                del_tree_with_rev(txn, parent.as_file_id(), inode)?;

Replacement in libpijul/src/output/output.rs at line 258 [5.671807]

∅:D[3.1729] → [5.681737:681836]

B:BD[5.681737] → [5.681737:681836]

                txn.put_tree(file_id_, inode)?;
                txn.put_revtree(inode, file_id_)?;

[3.1729]

[5.681836]

                put_tree_with_rev(txn, file_id_, inode)?;

Replacement in libpijul/src/output/output.rs at line 266 [5.671807]

∅:D[3.1793] → [5.682206:682297]

B:BD[5.682206] → [5.682206:682297]

            txn.put_tree(file_id_, inode)?;
            txn.put_revtree(inode, file_id_)?;

[3.1793]

[5.682297]

            put_tree_with_rev(txn, file_id_, inode)?;

Replacement in libpijul/src/output/output.rs at line 280 [5.671807]
∅:D[3.1853] → [5.682802:682885]
B:BD[5.682802] → [5.682802:682885]
```
        txn.put_tree(file_id_, inode)?;
        txn.put_revtree(inode, file_id_)?;
```
[3.1853]
[5.682885]
```
        put_tree_with_rev(txn, file_id_, inode)?;
```

Replacement in libpijul/src/output/output.rs at line 357 [5.671807]

B:BD[5.685693] → [5.685693:685885]

        assert!(txn.del_tree(fileid.as_file_id(), Some(*inode))?);
        if !fileid.basename.is_empty() {
            assert!(txn.del_revtree(*inode, Some(fileid.as_file_id()))?);
        }

[5.685693]

[5.685885]

        del_tree_with_rev(txn, fileid.as_file_id(), *inode)?;

Replacement in libpijul/src/output/output.rs at line 359 [5.671807]

B:BD[5.685946] → [5.685946:686069]

            assert!(txn.del_inodes(*inode, Some(vertex))?);
            assert!(txn.del_revinodes(vertex, Some(*inode))?);

[5.685946]

[5.686069]

            debug!("kill_dead_files {:?} {:?}", inode, vertex);
            del_inodes_with_rev(txn, *inode, vertex)?;

Replacement in libpijul/src/fs.rs at line 171 [5.737429]

B:BD[5.743256] → [5.743256:743414]

                assert!(txn.del_tree(parent_id.as_file_id(), Some(inode))?);
                assert!(txn.del_revtree(inode, Some(parent_id.as_file_id()))?);

[5.743256]

[5.743414]

                del_tree_with_rev(txn, parent_id.as_file_id(), inode)?;

Replacement in libpijul/src/fs.rs at line 173 [5.737429]

B:BD[5.743482] → [5.743482:743619]

                    assert!(txn.del_revinodes(vertex, Some(inode))?);
                    assert!(txn.del_inodes(inode, Some(vertex))?);

[5.743482]

[5.743619]

                    del_inodes_with_rev(txn, inode, vertex)?;

Replacement in libpijul/src/fs.rs at line 175 [5.737429]

B:BD[5.743637] → [5.743637:743764]

                txn.put_tree(parent_id.as_file_id(), child)?;
                txn.put_revtree(child, parent_id.as_file_id())?;

[5.743637]

[5.743764]

                put_tree_with_rev(txn, parent_id.as_file_id(), child)?;

Replacement in libpijul/src/fs.rs at line 191 [5.737429]

B:BD[5.744222] → [5.744222:744345]

        txn.put_tree(parent_id.as_file_id(), child_inode)?;
        txn.put_revtree(child_inode, parent_id.as_file_id())?;

[5.744222]

[5.744345]

        put_tree_with_rev(txn, parent_id.as_file_id(), child_inode)?;

Replacement in libpijul/src/fs.rs at line 248 [5.737429]

B:BD[5.746252] → [5.746252:746499]

    // org id pbMhYNkbwXVN5IhA6QR+oGisezusrYj/GXR0zMRLtTU=
    assert!(txn.del_tree(fileref.as_file_id(), Some(inode))?);
    assert!(txn.del_revtree(inode, Some(fileref.as_file_id()))?);
    // org id yM7YkGaAlCc1HX7iY/8kRuL9f2moGbKyzXKA/sGOdlM=

[5.746252]

[5.746499]

    del_tree_with_rev(txn, fileref.as_file_id(), inode)?;

Replacement in libpijul/src/fs.rs at line 298 [5.737429]

B:BD[5.747947] → [5.747947:748177]

        if !txn.del_tree(file_id.as_file_id(), Some(inode))? {
            debug!(
                "rec_delete (is_dir): {:?} {:?} not present",
                file_id.as_file_id(),
                inode
            );
        }

[5.747947]

[5.748177]

        assert!(txn.del_tree(file_id.as_file_id(), Some(inode))?);

Replacement in libpijul/src/fs.rs at line 300 [5.737429]

B:BD[5.748183] → [5.748183:748543]

    if txn.del_tree(parent.as_file_id(), Some(inode))? {
        assert!(txn.del_revtree(inode, Some(parent.as_file_id()))?);
        if update_inodes {
            if let Some(vertex) = txn.get_inodes(inode, None) {
                assert!(txn.del_revinodes(vertex, Some(inode))?);
                assert!(txn.del_inodes(inode, Some(vertex))?);
            }

[5.748183]

[5.748543]

    if del_tree_with_rev(txn, parent.as_file_id(), inode)? {
        if let Some(vertex) = txn.get_inodes(inode, None) {
            del_inodes_with_rev(txn, inode, vertex)?;

Replacement in libpijul/src/apply.rs at line 268 [5.944089]
B:BD[5.953809] → [5.953809:953864]
```
// org id zzKI7nUCrGP6P9+0nk29zZnRY1qcdFJH2tXwOxTn/xM=
```
[5.953809]
[5.953864]
Deletion in libpijul/src/apply.rs at line 277 [5.944089]
B:BD[5.954080] → [5.954080:954143]
```
        // org id 8cpuyZX4ja1VYT3lhtYBMXJenBtvUbVEGky3wZ6W/HM=
```
Deletion in libpijul/src/apply.rs at line 292 [5.944089]
B:BD[5.954670] → [5.954670:954733]
```
        // org id iTzVDtyzdcIEH3EDPbaq8PfGH9WgwLTd5XSxI5nK4Kc=
```

Replacement in libpijul/src/apply.rs at line 294 [5.944089]

B:BD[5.954864] → [5.954864:954997]

                txn.del_revtree(inode, Some(parent.as_file_id()))?;
                txn.del_tree(parent.as_file_id(), Some(inode))?;

[5.954864]

[5.954997]

                del_tree_with_rev(txn, parent.as_file_id(), inode)?;

Insertion in libpijul/src/apply.rs at line 296 [5.944089]
[5.955011]
[5.955011]
```
            // Delete the directory, if it's there.
```

Replacement in libpijul/src/apply.rs at line 306 [5.944089]

B:BD[5.955339] → [5.955339:955450]

                txn.del_inodes(inode, Some(vertex))?;
                txn.del_revinodes(vertex, Some(inode))?;

[5.955339]

[5.955450]

                del_inodes_with_rev(txn, inode, vertex)?;

Replacement in libpijul/src/apply.rs at line 312 [5.944089]
B:BD[5.955493] → [5.955493:955548]
```
// org id QIECdrRSNOnrMRRD9QO87SUCSg4dt9OUS5V6GZPPmeM=
```
[5.955493]
[5.955548]

Cleanup (debugging a crash related to trees/inodes)

Dependencies

In channels

Change contents

Deletion in pijul/src/commands/debug.rs at line 3 [5.177758]

Insertion in pijul/src/commands/debug.rs at line 5 [5.177758]

Insertion in pijul/src/commands/debug.rs at line 22 [5.177758]

Insertion in pijul/src/commands/debug.rs at line 25 [5.177758]

Replacement in pijul/Cargo.toml at line 4 [5.196374]

Replacement in pijul/Cargo.toml at line 49 [5.196374]

Replacement in libpijul/src/unrecord/working_copy.rs at line 17 [5.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 98 [5.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 149 [5.225940]

Deletion in libpijul/src/record.rs at line 179 [5.488880]

Insertion in libpijul/src/record.rs at line 180 [5.488880]

Insertion in libpijul/src/pristine/sanakirja.rs at line 421 [5.531056]

Deletion in libpijul/src/pristine/sanakirja.rs at line 424 [5.531056]

Insertion in libpijul/src/pristine/sanakirja.rs at line 425 [5.531056]

Deletion in libpijul/src/pristine/sanakirja.rs at line 635 [5.531056]

Insertion in libpijul/src/pristine/sanakirja.rs at line 641 [5.531056]

Insertion in libpijul/src/pristine/mod.rs at line 141 [5.586748]

Deletion in libpijul/src/pristine/mod.rs at line 260 [5.586748]

Deletion in libpijul/src/pristine/mod.rs at line 261 [5.586748]