wikijs and GIT backup

[Kilthor]

Hi I have searched and not found any answers. I have been using Wikijs for about 6 months in Docker using portainer. I have it backing up to github everything was working fine. 3 days ago it stopped backing up and gives this error "error: cannot pull with rebase: Your index contains uncommitted changes. error: please commit or stash them"
1 I have tried using "git stash " and "git pull -rebase" using CLI in wikijs It just tells me I don't have a repo /shrug
Is there somewhere with some step by step to work through this ??
I fixed it buy running untracked changes for like the 10th time not sure what is going on but she finally started sycning

[NGPixel]

I would suggest using the Purge Local Repository action, under Admin > Storage > Git. This will clear the local repository and recreate it. You can then do a Force Sync.

[No0key]

@dougbreaux you can fix this by entering couple commands. Login your container in the repo directory and type commands below

• git add .
• git commit -am "fix ..."

[dougbreaux]

@No0key Thanks. I didn't occur to me to shell into the pod and run git directly. Which has helped me with some other issues too. The above had indicated there were no uncommitted changes, but deactivating and reactivating the Git Storage instance did give a better error that helped me find my root cause. Which was that the SSH key being used had been removed or expired or something.

[lecoredump]

@NGPixel I can confirm No0key's finding about multiple assets uploaded at the same time being linked to this state in the Git repository (although not necessarily through Shift or Ctrl, even selecting multiple files before hitting the "Upload" button can result in this state).
Still not able to actually pinpoint why it happens, since sometimes everything goes smoothly... Hope this still helps though.

[CWCarlson123]

I've had the same issue. Git had not been update for 6 days, local repo was up to date, so just not pushing to git

I tried @NGPixel fix and didn't work, despite wikijs report the action had been completed and the git storage status was still the same and the Git repo had still not updated (last update 6 days ago). I checked the local repo though the CLI and all was ok. Did a "git status" and said it was ahead by 1 commit, working tree was clean.

I went and had some lunch, came back and (grasping at straws) I clicked the Apply button at the top of the admin > storage page on wikijs... problem solved, git repo last updated an hour ago...huh?! so just before I went on lunch!

so why didn't it clear earlier? why did I have to click apply, after it stated the purge and force sync actions were successful? Them being successful kind of implies that they were applied.

[serrnovik]

I'm having the same issue (deployed with current helm version 2.2.20):

Users edited a few pages. No other pushes from other places:

wikijs-5fc9df9dc5-wxl9p wiki Loading configuration from /wiki/config.yml... OK
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:31:13.045Z [JOB] info: Rendering page ID 1647...
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:31:13.348Z [JOB] info: Using database driver pg for postgres [ OK ]
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:31:14.239Z [JOB] info: Rendering page ID 1647: [ COMPLETED ]
wikijs-5fc9df9dc5-wxl9p wiki Loading configuration from /wiki/config.yml... OK
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:31:14.386Z [JOB] info: Rebuilding page tree...
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:31:14.752Z [JOB] info: Using database driver pg for postgres [ OK ]
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:31:15.118Z [JOB] info: Rebuilding page tree: [ COMPLETED ]
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:31:15.131Z [MASTER] info: (STORAGE/GIT) Committing new file [en] knowledge-base/tools/kimai...
wikijs-5fc9df9dc5-wxl9p wiki Loading configuration from /wiki/config.yml... OK
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:27.191Z [JOB] info: Rebuilding page tree...
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:27.554Z [JOB] info: Using database driver pg for postgres [ OK ]
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:27.921Z [JOB] info: Rebuilding page tree: [ COMPLETED ]
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:27.937Z [MASTER] info: (STORAGE/GIT) Committing file move from [en] user-docs/on-premises/Setting_up_development_environment to [en] dev-docs/Setting_up_development_environment...
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:44.626Z [MASTER] info: Syncing with storage target git...
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:44.631Z [MASTER] info: (STORAGE/GIT) Performing pull rebase from origin on branch main...
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:44.636Z [MASTER] error: Syncing with storage target git: [ FAILED ]
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:32:44.636Z [MASTER] error: error: cannot pull with rebase: You have unstaged changes.
wikijs-5fc9df9dc5-wxl9p wiki error: Please commit or stash them.
wikijs-5fc9df9dc5-wxl9p wiki
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:33:31.288Z [MASTER] info: (STORAGE/GIT) Performing pull rebase from origin on branch main...
wikijs-5fc9df9dc5-wxl9p wiki 2024-04-16T12:33:31.294Z [MASTER] warn: error: cannot pull with rebase: You have unstaged changes.
wikijs-5fc9df9dc5-wxl9p wiki error: Please commit or stash them.

I could resolve this by going manually to the pod and:
staging and committing (for some reason upstaged .svg file that i uploaded *through wikijs ui *(logo) ).

This is not the first time this happen, but the first time i investigated. Will take a closer look from now.

[matt1097]

@NGPixel I also can confirm this bug, and I dug into it a bit. It occurs when uploading multiple assets or sometimes back to back assets updates.

the problem appears to be a race condition. The first asset is still adding/commiting and the git process still has the lock. The second asset then tries to do the same thing, but git fails to grab the lock and fails out.
This leaves the repo with some files added and some unstaged changes which causes the sync process to fail.

I am willing to help out with a PR, but not sure what the best way to approach this just yet.

[No0key]

@NGPixel hello. Is there will be bugfix for this issue ?

[No0key]

@NGPixel ping

[No0key]

@NGPixel

[matt1097]

I opened a PR that appears to fix this on my end. #6511

it is a one line change if anyone wants to test it out in their environment as well.

[paolofacchinetti]

hey, just want to say thanks for this! I had to fix the issue through a cron that would sync with the remote git repo, but it was such an ugly hack :')