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

Fix rm and wm timestamp #1162

Merged
merged 14 commits into from Jul 12, 2023
Merged

Fix rm and wm timestamp #1162

merged 14 commits into from Jul 12, 2023

Conversation

Hitenjain14
Copy link
Member

Changes

Fixes

Tests

Tasks to complete before merging PR:

  • Ensure system tests are passing. If not Run them manually to check for any regressions 📋
  • Do any new system tests need added to test this change? do any existing system tests need updated? If so create a PR at 0chain/system_test
  • Merge your system tests PR to master AFTER merging this PR

Associated PRs (Link as appropriate):

  • 0chain:
  • gosdk:
  • system_test:
  • zboxcli:
  • zwalletcli:
  • Other: ...

@Hitenjain14 Hitenjain14 changed the base branch from staging to sprint-july-1 July 6, 2023 20:11
@service-0chain
Copy link
Collaborator

Manual system tests [failure] with the following config

config value
tests skipped false
system-tests sprint-july-1
gosdk users/sunilmhta/fix/2544/updateblobnvalidator
zboxcli users/sunilmhta/fix/2544/updateblobnvalidator
zwalletcli sprint-july-1
0chain users/sunilmhta/fix/2544/0chain/blobber-settings
blobber sprint-july-1
authorizer sprint-july-1
0box staging
0dns staging

@Hitenjain14 Hitenjain14 changed the title Fix fetch open challenge Fix rm and wm timestamp Jul 9, 2023
@service-0chain
Copy link
Collaborator

Manual system tests [failure] with the following config

config value
tests skipped false
system-tests sprint-july-1
gosdk NOT OVERRIDDEN
zboxcli sprint-july-1
zwalletcli sprint-july-1
0chain sprint-july-1
blobber fix/open-challenge
authorizer
0box sprint-july-1
0dns staging

@Hitenjain14 Hitenjain14 marked this pull request as ready for review July 9, 2023 21:28
@dabasov dabasov changed the base branch from sprint-july-1 to sprint-july-2 July 11, 2023 11:01
Copy link
Member

@dabasov dabasov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@dabasov dabasov merged commit c5ddc52 into sprint-july-2 Jul 12, 2023
6 checks passed
@dabasov dabasov deleted the fix/open-challenge branch July 12, 2023 14:36
Kishan-Dhakan added a commit that referenced this pull request Jul 16, 2023
* Add path in thumbnail hash (#1098)

* get path from changes

* pass rootRef in apply changes

* add logs

* fix deletechange

* fix multi op and copy

* fix delete root dir

* fix delete root change

* fix lint issue

* cleanup and stats change

* rename func to processMove

* calculate object tree in ref path

* rmv return from deleteChange

* revert changes

* move to filestore changes

* check prevRoot

* add logs and condition

* check filestore

* requested changes

* validate nil proof

* add move and copy dir tests

* add logs

* use path to add child

* fix error log

* fix add child

* add proof log

* add more logs

* change read log

* log objectPath

* add commit logs

* commit thumbnail first

* add missing param

* add missing param

* add path in the thumbnail hash

* add allocID and validation root index

* use write

* add condn in count query

* rmv thumbnail_filename

* log wm

* cleanup

* add rollback wm check

* allow empty allocation root

* fix tests

* check path in upload

* fix check

* empty commit

---------

Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>
Co-authored-by: Yury <yuderbasov@gmail.com>

* Dep/update (#1153)

* dependencies update

* dependencies update

* Remove fileID from fileMetaHash (#1114)

* rmv fileID from hash calc

* Trigger Build

* adding false commit to restart systemtests

* add path in fileMetaHash

* empty commit

---------

Co-authored-by: Yury <yuderbasov@gmail.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>

* optimize image (#1148)

Co-authored-by: boddumanohar <b.manu199@gmail.com>

* once for logger init

* Update challenge timing submission (#1140)

* update challenge timing submission

* fix createdAt in challenge timing table

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix blobber size (#1163)

* Do not redeem readmarkers for free reads (#1166)

* do not redeem readmarkers for free reads

* fix unit tests, remove readmarker handling from download method

* once for logger init (#1156)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* Hotfix/map concurrent write (#1158)

* once for logger init

* wider locking window

* Hotfix/remove custom nonce (#1141)

* removed custom nonce managing logic

* fixed logging

* updated gosdk

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* Use single file to avoid maintaining multiple version of same file (#1160)

* Use single file to avoid maintaining multiple version of same file

* Fix config path

* Remove variable

* Update path variable for blobber service

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* fix consume quota lock (#1173)

* Fix rm and wm timestamp (#1162)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* add lastChallengeTime log

* empty commit

* refactor timestamp check in markers

* Add diff txn for move to filestore

* return if duplicate

---------

Co-authored-by: dabasov <yuderbasov@gmail.com>

* fixed gitactions fix issue

* remove printing private key in logs (#1161)

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix concurrent upload issue (#1174)

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix/concurrent upload issue (#1175)

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix concurrent upload issue

---------

Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com>
Co-authored-by: Yury <yuderbasov@gmail.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Manali-Jain-squareops <86873900+Manali-Jain-squareops@users.noreply.github.com>
Co-authored-by: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com>
Co-authored-by: stewartie4 <ryanstewart456@gmail.com>
Co-authored-by: Dinmukhammed <52813950+din-mukhammed@users.noreply.github.com>
Co-authored-by: Laxmi Prasad Oli <olilaxmiprasad@gmail.com>
Co-authored-by: root <root@helm.cluster.local>
Manali-Jain-squareops added a commit that referenced this pull request Jul 19, 2023
* Add path in thumbnail hash (#1098)

* get path from changes

* pass rootRef in apply changes

* add logs

* fix deletechange

* fix multi op and copy

* fix delete root dir

* fix delete root change

* fix lint issue

* cleanup and stats change

* rename func to processMove

* calculate object tree in ref path

* rmv return from deleteChange

* revert changes

* move to filestore changes

* check prevRoot

* add logs and condition

* check filestore

* requested changes

* validate nil proof

* add move and copy dir tests

* add logs

* use path to add child

* fix error log

* fix add child

* add proof log

* add more logs

* change read log

* log objectPath

* add commit logs

* commit thumbnail first

* add missing param

* add missing param

* add path in the thumbnail hash

* add allocID and validation root index

* use write

* add condn in count query

* rmv thumbnail_filename

* log wm

* cleanup

* add rollback wm check

* allow empty allocation root

* fix tests

* check path in upload

* fix check

* empty commit

---------

Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>
Co-authored-by: Yury <yuderbasov@gmail.com>

* Dep/update (#1153)

* dependencies update

* dependencies update

* Remove fileID from fileMetaHash (#1114)

* rmv fileID from hash calc

* Trigger Build

* adding false commit to restart systemtests

* add path in fileMetaHash

* empty commit

---------

Co-authored-by: Yury <yuderbasov@gmail.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>

* optimize image (#1148)

Co-authored-by: boddumanohar <b.manu199@gmail.com>

* once for logger init

* Update challenge timing submission (#1140)

* update challenge timing submission

* fix createdAt in challenge timing table

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix blobber size (#1163)

* build base blobber optimization

* fixed indentation

* fix

* fix

* fix

* Do not redeem readmarkers for free reads (#1166)

* do not redeem readmarkers for free reads

* fix unit tests, remove readmarker handling from download method

* added docker ignore

* added docker ignore - testing

* once for logger init (#1156)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* Hotfix/map concurrent write (#1158)

* once for logger init

* wider locking window

* Hotfix/remove custom nonce (#1141)

* removed custom nonce managing logic

* fixed logging

* updated gosdk

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* Use single file to avoid maintaining multiple version of same file (#1160)

* Use single file to avoid maintaining multiple version of same file

* Fix config path

* Remove variable

* Update path variable for blobber service

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* fix consume quota lock (#1173)

* Fix rm and wm timestamp (#1162)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* add lastChallengeTime log

* empty commit

* refactor timestamp check in markers

* Add diff txn for move to filestore

* return if duplicate

---------

Co-authored-by: dabasov <yuderbasov@gmail.com>

* fixed gitactions fix issue

* remove printing private key in logs (#1161)

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix concurrent upload issue (#1174)

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix/concurrent upload issue (#1175)

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix concurrent upload issue

---------

Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com>
Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>
Co-authored-by: Yury <yuderbasov@gmail.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com>
Co-authored-by: stewartie4 <ryanstewart456@gmail.com>
Co-authored-by: Dinmukhammed <52813950+din-mukhammed@users.noreply.github.com>
Co-authored-by: Laxmi Prasad Oli <olilaxmiprasad@gmail.com>
Co-authored-by: root <root@helm.cluster.local>
dabasov added a commit that referenced this pull request Jul 22, 2023
* Add path in thumbnail hash (#1098)

* get path from changes

* pass rootRef in apply changes

* add logs

* fix deletechange

* fix multi op and copy

* fix delete root dir

* fix delete root change

* fix lint issue

* cleanup and stats change

* rename func to processMove

* calculate object tree in ref path

* rmv return from deleteChange

* revert changes

* move to filestore changes

* check prevRoot

* add logs and condition

* check filestore

* requested changes

* validate nil proof

* add move and copy dir tests

* add logs

* use path to add child

* fix error log

* fix add child

* add proof log

* add more logs

* change read log

* log objectPath

* add commit logs

* commit thumbnail first

* add missing param

* add missing param

* add path in the thumbnail hash

* add allocID and validation root index

* use write

* add condn in count query

* rmv thumbnail_filename

* log wm

* cleanup

* add rollback wm check

* allow empty allocation root

* fix tests

* check path in upload

* fix check

* empty commit

---------

Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>
Co-authored-by: Yury <yuderbasov@gmail.com>

* Dep/update (#1153)

* dependencies update

* dependencies update

* Remove fileID from fileMetaHash (#1114)

* rmv fileID from hash calc

* Trigger Build

* adding false commit to restart systemtests

* add path in fileMetaHash

* empty commit

---------

Co-authored-by: Yury <yuderbasov@gmail.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>

* optimize image (#1148)

Co-authored-by: boddumanohar <b.manu199@gmail.com>

* once for logger init

* Update challenge timing submission (#1140)

* update challenge timing submission

* fix createdAt in challenge timing table

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix blobber size (#1163)

* Do not redeem readmarkers for free reads (#1166)

* do not redeem readmarkers for free reads

* fix unit tests, remove readmarker handling from download method

* updated dependencies

* once for logger init (#1156)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* Hotfix/map concurrent write (#1158)

* once for logger init

* wider locking window

* Hotfix/remove custom nonce (#1141)

* removed custom nonce managing logic

* fixed logging

* updated gosdk

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* Use single file to avoid maintaining multiple version of same file (#1160)

* Use single file to avoid maintaining multiple version of same file

* Fix config path

* Remove variable

* Update path variable for blobber service

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* fix consume quota lock (#1173)

* Fix rm and wm timestamp (#1162)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* add lastChallengeTime log

* empty commit

* refactor timestamp check in markers

* Add diff txn for move to filestore

* return if duplicate

---------

Co-authored-by: dabasov <yuderbasov@gmail.com>

* fixed gitactions fix issue

* remove printing private key in logs (#1161)

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix concurrent upload issue (#1174)

* Fix concurrent upload issue

* Fix concurrent upload issue

* Update go.mod

---------

Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com>
Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Manali-Jain-squareops <86873900+Manali-Jain-squareops@users.noreply.github.com>
Co-authored-by: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com>
Co-authored-by: stewartie4 <ryanstewart456@gmail.com>
Co-authored-by: Dinmukhammed <52813950+din-mukhammed@users.noreply.github.com>
Co-authored-by: Laxmi Prasad Oli <olilaxmiprasad@gmail.com>
Co-authored-by: root <root@helm.cluster.local>
dabasov added a commit that referenced this pull request Jul 25, 2023
* Add path in thumbnail hash (#1098)

* get path from changes

* pass rootRef in apply changes

* add logs

* fix deletechange

* fix multi op and copy

* fix delete root dir

* fix delete root change

* fix lint issue

* cleanup and stats change

* rename func to processMove

* calculate object tree in ref path

* rmv return from deleteChange

* revert changes

* move to filestore changes

* check prevRoot

* add logs and condition

* check filestore

* requested changes

* validate nil proof

* add move and copy dir tests

* add logs

* use path to add child

* fix error log

* fix add child

* add proof log

* add more logs

* change read log

* log objectPath

* add commit logs

* commit thumbnail first

* add missing param

* add missing param

* add path in the thumbnail hash

* add allocID and validation root index

* use write

* add condn in count query

* rmv thumbnail_filename

* log wm

* cleanup

* add rollback wm check

* allow empty allocation root

* fix tests

* check path in upload

* fix check

* empty commit

---------

Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>
Co-authored-by: Yury <yuderbasov@gmail.com>

* Dep/update (#1153)

* dependencies update

* dependencies update

* Remove fileID from fileMetaHash (#1114)

* rmv fileID from hash calc

* Trigger Build

* adding false commit to restart systemtests

* add path in fileMetaHash

* empty commit

---------

Co-authored-by: Yury <yuderbasov@gmail.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>

* optimize image (#1148)

Co-authored-by: boddumanohar <b.manu199@gmail.com>

* once for logger init

* Update challenge timing submission (#1140)

* update challenge timing submission

* fix createdAt in challenge timing table

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix blobber size (#1163)

* Do not redeem readmarkers for free reads (#1166)

* do not redeem readmarkers for free reads

* fix unit tests, remove readmarker handling from download method

* once for logger init (#1156)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* Hotfix/map concurrent write (#1158)

* once for logger init

* wider locking window

* Hotfix/remove custom nonce (#1141)

* removed custom nonce managing logic

* fixed logging

* updated gosdk

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* uncommented previous nonce logic

* Use single file to avoid maintaining multiple version of same file (#1160)

* Use single file to avoid maintaining multiple version of same file

* Fix config path

* Remove variable

* Update path variable for blobber service

---------

Co-authored-by: Yury <yuderbasov@gmail.com>

* fix consume quota lock (#1173)

* Fix rm and wm timestamp (#1162)

* once for logger init

* init logging the same way we do in 0chain

* init logging the same way we do in 0chain

* add lastChallengeTime log

* empty commit

* refactor timestamp check in markers

* Add diff txn for move to filestore

* return if duplicate

---------

Co-authored-by: dabasov <yuderbasov@gmail.com>

* fixed gitactions fix issue

* remove printing private key in logs (#1161)

Co-authored-by: Yury <yuderbasov@gmail.com>

* Fix concurrent upload issue (#1174)

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix/concurrent upload issue (#1175)

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix concurrent upload issue

* Fix concurrent upload issue

* remove from docker compose files

* remove reference to postgres-post

* remove in conductor docker compose

* remove useless changes

---------

Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com>
Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com>
Co-authored-by: Yury <yuderbasov@gmail.com>
Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Co-authored-by: boddumanohar <b.manu199@gmail.com>
Co-authored-by: Manali-Jain-squareops <86873900+Manali-Jain-squareops@users.noreply.github.com>
Co-authored-by: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com>
Co-authored-by: stewartie4 <ryanstewart456@gmail.com>
Co-authored-by: Dinmukhammed <52813950+din-mukhammed@users.noreply.github.com>
Co-authored-by: Laxmi Prasad Oli <olilaxmiprasad@gmail.com>
Co-authored-by: root <root@helm.cluster.local>
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.

None yet

3 participants