Skip to content

Commit 37b1a6c

Browse files
devyetiiHitenjain14Kishan-Dhakandabasovshahnawaz-creator
authored
Fix/remove postgres post (#1176)
* 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]> * optimize image (#1148) Co-authored-by: boddumanohar <[email protected]> * 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) * 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) * 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 <[email protected]> * fixed gitactions fix issue * remove printing private key in logs (#1161) Co-authored-by: Yury <[email protected]> * 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 <[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: Jayash Satolia <[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: root <[email protected]>
1 parent 697233e commit 37b1a6c

File tree

5 files changed

+1
-81
lines changed

5 files changed

+1
-81
lines changed

docker.local/b0docker-compose-debug.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,10 @@ services:
1414
- ./sql_init:/docker-entrypoint-initdb.d
1515
networks:
1616
default:
17-
postgres-post:
18-
image: postgres:14
19-
environment:
20-
POSTGRES_PORT: 5432
21-
POSTGRES_HOST: postgres
22-
POSTGRES_USER: postgres
23-
volumes:
24-
- ../bin:/blobber/bin
25-
- ../sql:/blobber/sql
26-
command: bash /blobber/bin/postgres-entrypoint.sh
27-
links:
28-
- postgres:postgres
2917
validator:
3018
image: validator
3119
environment:
3220
- DOCKER= true
33-
depends_on:
34-
- postgres-post
35-
links:
36-
- postgres-post:postgres-post
3721
volumes:
3822
- ../config:/validator/config
3923
- ./blobber${BLOBBER}/data:/validator/data

docker.local/b0docker-compose-github.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ services:
1414
- ./sql_init:/docker-entrypoint-initdb.d
1515
networks:
1616
default:
17-
postgres-post:
18-
image: postgres:14
19-
environment:
20-
POSTGRES_PORT: 5432
21-
POSTGRES_HOST: postgres
22-
POSTGRES_USER: postgres
23-
volumes:
24-
- ../bin:/blobber/bin
25-
- ../sql:/blobber/sql
26-
command: bash /blobber/bin/postgres-entrypoint.sh
27-
links:
28-
- postgres:postgres
2917

3018
networks:
3119
default:

docker.local/b0docker-compose.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,10 @@ services:
1414
- ./sql_init:/docker-entrypoint-initdb.d
1515
networks:
1616
default:
17-
postgres-post:
18-
image: postgres:14
19-
environment:
20-
POSTGRES_PORT: 5432
21-
POSTGRES_HOST: postgres
22-
POSTGRES_USER: postgres
23-
POSTGRES_PASSWORD: secret
24-
volumes:
25-
- ../bin:/blobber/bin
26-
- ../sql:/blobber/sql
27-
command: bash /blobber/bin/postgres-entrypoint.sh
28-
links:
29-
- postgres:postgres
3017
validator:
3118
image: validator
3219
environment:
3320
- DOCKER= true
34-
depends_on:
35-
- postgres-post
36-
links:
37-
- postgres-post:postgres-post
3821
volumes:
3922
- ${CONFIG_PATH:-../config}:/validator/config #value after :- is default value
4023
- ./blobber${BLOBBER}/data:/validator/data

docker.local/docker-compose.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,10 @@ services:
1111
- "543${BLOBBER}:5432"
1212
labels:
1313
zchain: "postgres"
14-
postgres-post:
15-
image: postgres:14
16-
environment:
17-
POSTGRES_PORT: 5432
18-
POSTGRES_HOST: postgres
19-
POSTGRES_USER: postgres
20-
volumes:
21-
- ../bin:/blobber/bin
22-
- ../sql:/blobber/sql
23-
labels:
24-
zchain: "postgres-post"
25-
command: bash /blobber/bin/postgres-entrypoint.sh
26-
links:
27-
- postgres:postgres
2814
validator:
2915
image: validator
3016
environment:
3117
- DOCKER= true
32-
depends_on:
33-
- postgres-post
34-
links:
35-
- postgres-post:postgres-post
3618
volumes:
3719
- ../config:/validator/config
3820
- ./blobber${BLOBBER}/data:/validator/data

docker.local/https.docker-compose.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,17 @@ services:
44
image: postgres:14
55
volumes:
66
- ./blobber${BLOBBER}/data/postgresql:/var/lib/postgresql/data
7+
- ./sql_init:/docker-entrypoint-initdb.d
78
networks:
89
default:
910
ports:
1011
- "543${BLOBBER}:5432"
1112
labels:
1213
zchain: "postgres"
13-
postgres-post:
14-
image: postgres:14
15-
environment:
16-
POSTGRES_PORT: 5432
17-
POSTGRES_HOST: postgres
18-
POSTGRES_USER: postgres
19-
volumes:
20-
- ../bin:/blobber/bin
21-
- ../sql:/blobber/sql
22-
labels:
23-
zchain: "postgres-post"
24-
command: bash /blobber/bin/postgres-entrypoint.sh
25-
links:
26-
- postgres:postgres
2714
validator:
2815
image: validator
2916
environment:
3017
- DOCKER= true
31-
depends_on:
32-
- postgres-post
33-
links:
34-
- postgres-post:postgres-post
3518
volumes:
3619
- ../config:/validator/config
3720
- ./blobber${BLOBBER}/data:/validator/data

0 commit comments

Comments
 (0)