Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync path modifications, cargo bump, minor cleanups #21

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

kallisti5
Copy link

@kallisti5
Copy link
Author

actually, running into other random build failures as well. Might be time for a full cargo update? That solves all of them for me.

* Resolves a few misc build errors.
@kallisti5 kallisti5 changed the title cargo: Bump version_check to 0.9.4 cargo: Bump versions; minor cleanups Nov 8, 2023
@kallisti5
Copy link
Author

One reason i'm fiddling here is I want to add a froms3 😸

@jcaesar
Copy link
Owner

jcaesar commented Nov 13, 2023

I think it might be time for a full cargo upgrade. ;)

Do you want write access to this repo?

@jcaesar jcaesar changed the title cargo: Bump versions; minor cleanups sync path modifications, cargo bump, minor cleanups Dec 17, 2023
@jcaesar
Copy link
Owner

jcaesar commented Dec 17, 2023

I'll see if I can make this into a setting over christmas.

@kallisti5
Copy link
Author

I should note, it's not easy to "convert" to a new sync design.

I swapped over to this design by moving files around on mfs:

$ ipfs files ls /haikuports/master/
.sharename
.sync
riscv64
x86_64
x86_gcc2

(.sync matching the state tracking dir)

However, ftp2mfs with these modifications doesn't catch the existing data..

ipfs@pi01:~/ftp2mfs$ ftp2mfs --config haikuports-master.toml 
[2023-12-19T22:40:52Z WARN  ftp2mfs] workdir not specified in settings, defaulting to "/temp/6147ac6abf4fb3d317423bdfd1c7f641cdb814ba4b59c1c084913cde4c2cd3b1"
[2023-12-19T22:40:52Z INFO  ftp2mfs::tomfs] Recovering from partial sync...
[2023-12-19T22:40:54Z INFO  ftp2mfs::tomfs] Recovered 0 B in 0 files.
[2023-12-19T22:40:57Z INFO  ftp2mfs] Will sync at least 125.8 GB in 17403 files, final size: 125.8 GB in 17403 files.
[2023-12-19T22:40:58Z INFO  ftp2mfs::tomfs] Syncing x86_gcc2/current/packages/flex_source-2.6.4-4-source.hpkg
[2023-12-19T22:40:58Z INFO  ftp2mfs::tomfs] Syncing x86_64/current/packages/kactivities_source-5.93.0-1-source.hpkg
[2023-12-19T22:40:58Z INFO  ftp2mfs::tomfs] Syncing x86_gcc2/current/repo
[2023-12-19T22:40:58Z INFO  ftp2mfs::tomfs] Syncing x86_gcc2/current/packages/ucpp_source-1.3.2-1-source.hpkg

Maybe the context directory for the state file is wrong

$ ipfs files read /haikuports/master/.sync/state
{"version":1,"files":{".sharename":{"t":"2020-08-09T16:27:56Z","s":18},"riscv64/current/old_packages/autoconf-2.71-1-riscv64.hpkg":{"t":"2023-06-16T14:03:24Z","s":1461923},"riscv64/current/old_packages/binutils-2.32_2021_02_27-1-riscv64.hpkg":{"t":"2022-05-26T17:52:03Z","s":6162900},"riscv64/current/old_packages/coreutils-8.22-1-riscv64.hpkg":{"t":"2022-05-26T17:52:17Z","s":4371177},"riscv64/current/old_packages/curl-7.40.0-1-riscv64.hpkg":{"t":"2022-05-26T17:52:20Z","s":293333},"riscv64/current/old_packages/curl_devel-7.40.0-1-riscv64.hpkg":{"t":"2022-05-26T17:52:24Z","s":569460},"riscv64/current/old_packages/expat-2.4.1-1-riscv64.hpkg":{"t":"2022-05-26T17:52:28Z","s":223089},"riscv64/current/old_packages/expat_devel-2.4.1-1-riscv64.hpkg":{"t":"2022-05-26T17:52:32Z","s":680777},"riscv64/current/old_packages/gcc-11.2.0_2021_07_28-7-riscv64.hpkg":{"t":"2022-05-26T17:54:13Z","s":57674577},"riscv64/current/old_packages/gcc_fortran-11.2.0_2021_07_28-7-riscv64.hpkg":{"t":"2022-05-26T17:54:31Z","s":12098707},"riscv64/current/old_packages/gcc_syslibs-11.2.0_2021_07_28-7-riscv64.hpkg":{"t":"2022-05-26T17:54:37Z","s":1404079},"riscv64/current/old_packages/gcc_syslibs_devel-11.2.0_2021_07_28-7-riscv64.hpkg":{"t":"2022-05-26T17:54:45Z","s":3534014},"riscv64/current/old_packages/grep-2.14-1-riscv64.hpkg":{"t":"2022-05-26T17:54:55Z","s":263293},"riscv64/current/old_packages/libtool_source-2.4.6-3-source.hpkg":{"t":"2023-06-18T15:34:28Z","s":1843070},"riscv64/current/old_packages/ncurses6-6.2-1-riscv64.hpkg":

@kallisti5
Copy link
Author

kallisti5 commented Dec 19, 2023

Ah! it works! You have to fully erase any existing /temp/XXX folders when you convert to the new layout. Then it works as expected...

[2023-12-19T22:49:05Z INFO  ftp2mfs] Will sync at least 2.6 GB in 66 files and delete 50 files, final size: 125.8 GB in 17403 files.
[2023-12-19T22:49:06Z INFO  ftp2mfs::tomfs] Syncing x86_64/current/packages/scummvm-2.8.0-1-x86_64.hpkg

@kallisti5
Copy link
Author

From a design standpoint, maybe add the ability to specify a custom state tracking directory? Then you can place it at an alternative location not directly within the sync path.

source: rsync.....
destination: /thinga
mfs_state: /thinga/.sync or /thinga-sync or /.sync-thinga, etc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants