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

Sprint july 4 #1212

Merged
merged 45 commits into from
Aug 16, 2023
Merged

Sprint july 4 #1212

merged 45 commits into from
Aug 16, 2023

Conversation

Kishan-Dhakan
Copy link
Contributor

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: ...

Jayashsatolia403 and others added 30 commits May 31, 2023 12:28
…_challenge_id' into feature/get_challenge_timings_by_challenge_id
* 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 <[email protected]>
Co-authored-by: Yury <[email protected]>
* dependencies update

* dependencies update
* rmv fileID from hash calc

* Trigger Build

* adding false commit to restart systemtests

* add path in fileMetaHash

* empty commit

---------

Co-authored-by: Yury <[email protected]>
Co-authored-by: shahnawaz-creator <[email protected]>
Co-authored-by: boddumanohar <[email protected]>
Co-authored-by: Kishan Dhakan <[email protected]>
Co-authored-by: boddumanohar <[email protected]>
* update challenge timing submission

* fix createdAt in challenge timing table

---------

Co-authored-by: Yury <[email protected]>
* Fix

* Fix

* Fix

* Debug

* Debug

* Fix lint

* Fix

* Fix

* False commit

* Fix

* Debug

* False commit

* Fix

* Fix

* Fix

* Fix timestamp error

* Added caching in GetOrCreate too

* Fix

* Fix typecast

* 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 <[email protected]>
Co-authored-by: Yury <[email protected]>

* 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 <[email protected]>
Co-authored-by: shahnawaz-creator <[email protected]>
Co-authored-by: boddumanohar <[email protected]>
Co-authored-by: Kishan Dhakan <[email protected]>

* Fixed lints

* Added ceil

* optimize image (#1148)

Co-authored-by: boddumanohar <[email protected]>

* Fix

* once for logger init

* Update challenge timing submission (#1140)

* update challenge timing submission

* fix createdAt in challenge timing table

---------

Co-authored-by: Yury <[email protected]>

* Fix blobber size (#1163)

* cleaning up caching code

* 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 <[email protected]>

* fix consume quota lock (#1173)

* add sprint* branches in tests.yml

* fixed merge problem

* fixed merge problem

* add logs in wm lock

* fixed broken unit test

* fix type assertion

* fix nil pointer dereference

* fix get alloc by id

---------

Co-authored-by: Hitenjain14 <[email protected]>
Co-authored-by: Kishan Dhakan <[email protected]>
Co-authored-by: Yury <[email protected]>
Co-authored-by: shahnawaz-creator <[email protected]>
Co-authored-by: boddumanohar <[email protected]>
Co-authored-by: Manali-Jain-squareops <[email protected]>
Co-authored-by: stewartie4 <[email protected]>
Co-authored-by: Dinmukhammed <[email protected]>
Co-authored-by: Laxmi Prasad Oli <[email protected]>
Co-authored-by: Hitenjain14 <[email protected]>
Co-authored-by: din-mukhammed <[email protected]>
Kishan-Dhakan and others added 15 commits July 31, 2023 17:36
Save allocation using cache method
…challenge_timings_by_challenge_id

# Conflicts:
#	code/go/0chain.net/blobbercore/readmarker/readmarker.go
#	docker.local/.dockerignore
#	go.mod
#	go.sum
…_challenge_id

Added challenge-timings-by-challengeId endpoint
* add rb logs

* fix rollback wm check

* never replace existent transaction

* never replace existent transaction

* close transaction

* revert

* fix checkout build-&-publish-docker-image.yml

* configuration

* configuration

* cleaned up transaction logic

* cleaned up transaction logic

* cleaned up transaction logic

* cleaned up transaction logic

* fixed tests

* fixed tests

---------

Co-authored-by: Hitenjain14 <[email protected]>
Co-authored-by: shahnawaz-creator <[email protected]>
* Added stats for validator

* Beautify

* Fix lint

* Added mutex

* Added mutex for getters

* Added mutex for getters
* Added stats for validator

* Beautify

* Fix lint

* Added mutex

* Added mutex for getters

* Added mutex for getters

* Remove redundant locking and unlocking
* Added stats for validator

* Beautify

* Fix lint

* Added mutex

* Added mutex for getters

* Added mutex for getters

* Remove redundant locking and unlocking

* Fix
* Send WM commit status to conductor

* Rename file

* Modify log type

* Add state for stopping blobber from committing WM

* Log error

---------

Co-authored-by: Ebrahim Gomaa <[email protected]>
* update indexes and validate upload

* fix typo

* add time log to with connection

* add more logging

* rever tree validation changes

* use copyBuffer

* hash write changes

* clean up non-essential timings

* removed all timings

* fix ut

---------

Co-authored-by: Dinmukhammed Kambarov <[email protected]>
Co-authored-by: din-mukhammed <[email protected]>
@Kishan-Dhakan Kishan-Dhakan merged commit 050f611 into staging Aug 16, 2023
9 of 10 checks passed
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.

8 participants