Skip to content

Commit 7cb868e

Browse files
fru1tworldparkblo
fru1tworld
and
parkblo
authored
Feature/load balancer (#11)
* fix: api 서버와 websocket 분리를 위해 backend 서버 네임 변경 * feature/split api websocket * fix: 분리 후 중복되는 코드 삭제 * fix: 불필요한 파일 삭제 및 하위 subTree connection 연결되어있는 경우 저장되는 오류 해결 * feat: load-balancer server 초기 세팅 nest 생성 redis container 설정 docker-compose 수정 * fix: 하위 subTree 삭제됐는데 note를 생성할 수 있는 로직 수정 * fix: 삭제된 트리에서 노트가 생성되던 문제 해결 및 Validation 계층추가로 결합도 낮추기 * feat: redis 환경 설정 및 연결 여부 확인 * feat: load-balancer server && WebSocket Server 분산 작업 및 docker-compose 작업 * fix: url 주소 변경됨에 따라 urlParse 로직 일부 수정 * fix: room2 연결 안되던 문제 해결 * fix: cron이 작동하지 않는 문제 해결 * feat: lb-server 기능 개발 * fix: lb-server key값 수정 * feat: load-balancer 로직 구현 * feat: lb 요청 로직 추가 * fix: lb 요청 로직 비동기로 작동하도록 수정 * fix: window 상에서 redis 포트 사용 불가로 docker-compose override 수정 * fix: 웹소켓 연결 시 순환참조 수정 * fix: note 생성 요청에 spaceId 추가 * fix: validation 검증 로직 수정 * fix: deploy q * Revert 5 feature/load balancer (#10) * docs: 리드미 링크 수정 (#6) * Wesocket서버 및 API 서버 분리 (#3) * fix: api 서버와 websocket 분리를 위해 backend 서버 네임 변경 * feature/split api websocket * fix: 분리 후 중복되는 코드 삭제 * Load-Balancer 서버 구현 (#5) * fix: api 서버와 websocket 분리를 위해 backend 서버 네임 변경 * feature/split api websocket * fix: 분리 후 중복되는 코드 삭제 * fix: 불필요한 파일 삭제 및 하위 subTree connection 연결되어있는 경우 저장되는 오류 해결 * feat: load-balancer server 초기 세팅 nest 생성 redis container 설정 docker-compose 수정 * fix: 하위 subTree 삭제됐는데 note를 생성할 수 있는 로직 수정 * fix: 삭제된 트리에서 노트가 생성되던 문제 해결 및 Validation 계층추가로 결합도 낮추기 * feat: redis 환경 설정 및 연결 여부 확인 * feat: load-balancer server && WebSocket Server 분산 작업 및 docker-compose 작업 * fix: url 주소 변경됨에 따라 urlParse 로직 일부 수정 * fix: room2 연결 안되던 문제 해결 * fix: cron이 작동하지 않는 문제 해결 * feat: lb-server 기능 개발 * fix: lb-server key값 수정 * feat: load-balancer 로직 구현 * feat: lb 요청 로직 추가 * fix: lb 요청 로직 비동기로 작동하도록 수정 * fix: window 상에서 redis 포트 사용 불가로 docker-compose override 수정 * fix: 웹소켓 연결 시 순환참조 수정 * fix: note 생성 요청에 spaceId 추가 * fix: validation 검증 로직 수정 * feat: 노트 에디터 로드밸런싱 로직 적용 --------- Co-authored-by: Byeongju Park <[email protected]> * Revert "Load-Balancer 서버 구현 (#5)" This reverts commit 8916395. --------- Co-authored-by: Byeongju Park <[email protected]> --------- Co-authored-by: Byeongju Park <[email protected]>
1 parent 1a4de31 commit 7cb868e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1523
-323
lines changed

‎docker-compose.override.yml‎

Lines changed: 149 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.8"
2-
31
services:
42
mysql:
53
image: mysql:8.0
@@ -23,14 +21,110 @@ services:
2321
retries: 3
2422
command: --bind-address=0.0.0.0
2523

26-
collaborative:
24+
collaborative_room1:
2725
build:
2826
context: .
2927
dockerfile: ./packages/collaborative/Dockerfile
30-
container_name: collaborative
28+
container_name: collaborative-room1
3129
ports:
3230
- "3001:3001"
3331
- "9001:9001"
32+
depends_on:
33+
redis:
34+
condition: service_healthy
35+
mysql:
36+
condition: service_healthy
37+
mongodb:
38+
condition: service_healthy
39+
environment:
40+
- MYSQL_HOST=mysql-container
41+
- MYSQL_PORT=3306
42+
- MYSQL_DATABASE=dev_db
43+
- MYSQL_PASSWORD=1234
44+
- MYSQL_USER=honey
45+
- NODE_ENV=dev
46+
- MONGO_HOST=mongodb-container
47+
- MONGO_USER=honey
48+
- MONGO_PASSWORD=1234
49+
- MONGO_DB=dev_db
50+
- LOG_LEVEL=debug
51+
- REDIS_HOST=redis-container
52+
- REDIS_USERNAME=honey
53+
- REDIS_PORT=6530
54+
- REDIS_PASSWORD=1234
55+
- SERVER_ID=room1
56+
- WS_PORT=9001
57+
networks:
58+
- app-network
59+
60+
collaborative_room2:
61+
build:
62+
context: .
63+
dockerfile: ./packages/collaborative/Dockerfile
64+
container_name: collaborative-room2
65+
ports:
66+
- "3002:3002"
67+
- "9002:9002"
68+
depends_on:
69+
redis:
70+
condition: service_healthy
71+
mysql:
72+
condition: service_healthy
73+
mongodb:
74+
condition: service_healthy
75+
environment:
76+
- MYSQL_HOST=mysql-container
77+
- MYSQL_PORT=3306
78+
- MYSQL_DATABASE=dev_db
79+
- MYSQL_PASSWORD=1234
80+
- MYSQL_USER=honey
81+
- NODE_ENV=dev
82+
- MONGO_HOST=mongodb-container
83+
- MONGO_USER=honey
84+
- MONGO_PASSWORD=1234
85+
- MONGO_DB=dev_db
86+
- LOG_LEVEL=debug
87+
- REDIS_HOST=redis-container
88+
- REDIS_USERNAME=honey
89+
- REDIS_PORT=6530
90+
- REDIS_PASSWORD=1234
91+
- SERVER_ID=room2
92+
- WS_PORT=9002
93+
networks:
94+
- app-network
95+
api:
96+
build:
97+
context: .
98+
dockerfile: ./packages/api/Dockerfile
99+
container_name: api
100+
ports:
101+
- "3000:3000"
102+
depends_on:
103+
mysql:
104+
condition: service_healthy
105+
mongodb:
106+
condition: service_healthy
107+
environment:
108+
- MYSQL_HOST=mysql-container
109+
- MYSQL_PORT=3306
110+
- MYSQL_DATABASE=dev_db
111+
- MYSQL_PASSWORD=1234
112+
- MYSQL_USER=honey
113+
- NODE_ENV=dev
114+
- MONGO_HOST=mongodb-container
115+
- MONGO_USER=honey
116+
- MONGO_PASSWORD=1234
117+
- MONGO_DB=dev_db
118+
- LOG_LEVEL=debug
119+
networks:
120+
- app-network
121+
api:
122+
build:
123+
context: .
124+
dockerfile: ./packages/api/Dockerfile
125+
container_name: api
126+
ports:
127+
- "3000:3000"
34128
depends_on:
35129
mysql:
36130
condition: service_healthy
@@ -77,20 +171,45 @@ services:
77171
networks:
78172
- app-network
79173

80-
frontend:
174+
load-balancer:
175+
build:
176+
context: .
177+
dockerfile: ./packages/loadbalancer/Dockerfile
178+
container_name: lb-container
179+
ports:
180+
- "4242:4242"
181+
depends_on:
182+
redis:
183+
condition: service_healthy
184+
networks:
185+
- app-network
186+
environment:
187+
- LOG_LEVEL=debug
188+
- REDIS_HOST=redis-container
189+
- REDIS_USERNAME=honey
190+
- REDIS_PORT=6530
191+
- REDIS_PASSWORD=1234
192+
193+
frotend:
81194
build:
82195
context: .
83196
dockerfile: ./packages/frontend/Dockerfile
84197
container_name: frontend
85198
ports:
86199
- "80:80"
87200
depends_on:
88-
collaborative:
201+
load-balancer:
202+
condition: service_started
203+
collaborative_room1:
204+
condition: service_started
205+
collaborative_room2:
206+
89207
condition: service_started
90208
api:
91209
condition: service_started
92210
networks:
93211
- app-network
212+
94213
mongodb:
95214
image: mongo:latest
96215
container_name: mongodb-container
@@ -122,6 +241,30 @@ services:
122241
timeout: 5s
123242
retries: 10
124243

244+
redis:
245+
image: redis:latest
246+
container_name: redis-container
247+
ports:
248+
- "6530:6530"
249+
networks:
250+
- app-network
251+
environment:
252+
REDIS_DISABLE_COMMANDS: "FLUSHDB FLUSHALL"
253+
command:
254+
[
255+
"redis-server",
256+
"--port",
257+
"6530",
258+
"--requirepass",
259+
"1234",
260+
"--bind",
261+
"0.0.0.0",
262+
]
263+
healthcheck:
264+
test: ["CMD", "redis-cli", "-p", "6530", "ping"]
265+
interval: 10s
266+
timeout: 5s
267+
retries: 3
125268
volumes:
126269
mysql_data:
127270
mongo_data:

‎docker-compose.prod.yml‎

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,98 @@ services:
88
curl -f telnet://${MYSQL_HOST}:${MYSQL_PORT} || exit 1;
99
curl -f telnet://${MONGO_HOST}:27017 || exit 1;
1010
"
11-
networks:
12-
- app-network
1311
healthcheck:
1412
test: ["CMD", "/bin/sh", "-c", "exit 0"]
1513
interval: 10s
1614
timeout: 5s
1715
retries: 3
1816

17+
loadbalancer:
18+
container_name: loadbalancer
19+
ports:
20+
- "4242:4242"
21+
build:
22+
target: production
23+
environment:
24+
# 배포 환경 세팅
25+
- NODE_ENV=production
26+
27+
# Mongo 세팅
28+
- LOG_LEVEL=${LOG_LEVEL}
29+
30+
# Redis 세팅
31+
- REDIS_USERNAME=${REDIS_USERNAME}
32+
- REDIS_PASSWORD=${REDIS_PASSWORD}
33+
- REDIS_HOST=${REDIS_HOST}
34+
- REDIS_PORT=${REDIS_PORT}
35+
networks:
36+
- app-network
37+
collaborative-room1:
38+
container_name: collaborative-room1
39+
ports:
40+
- "9001:9001"
41+
build:
42+
target: production
43+
environment:
44+
# 배포 환경 세팅
45+
- NODE_ENV=production
46+
47+
# MySQL 세팅
48+
- MYSQL_HOST=${MYSQL_HOST}
49+
- MYSQL_PORT=${MYSQL_PORT}
50+
- MYSQL_USER=${MYSQL_USER}
51+
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
52+
- MYSQL_DATABASE=${MYSQL_DATABASE}
53+
54+
# Mongo 세팅
55+
- MONGO_HOST=${MONGO_HOST}
56+
- MONGO_USER=${MONGO_USER}
57+
- MONGO_PASSWORD=${MONGO_PASSWORD}
58+
- MONGO_DB=${MONGO_DB}
59+
- LOG_LEVEL=${LOG_LEVEL}
60+
61+
# Redis 세팅
62+
- REDIS_USERNAME=${REDIS_USERNAME}
63+
- REDIS_PASSWORD=${REDIS_PASSWORD}
64+
- REDIS_HOST=${REDIS_HOST}
65+
- REDIS_PORT=${REDIS_PORT}
66+
67+
- WS_PORT=${WS1_PORT}
68+
networks:
69+
- app-network
70+
collaborative-room2:
71+
container_name: collaborative-room2
72+
ports:
73+
- "9001:9002"
74+
build:
75+
target: production
76+
environment:
77+
# 배포 환경 세팅
78+
- NODE_ENV=production
79+
80+
# MySQL 세팅
81+
- MYSQL_HOST=${MYSQL_HOST}
82+
- MYSQL_PORT=${MYSQL_PORT}
83+
- MYSQL_USER=${MYSQL_USER}
84+
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
85+
- MYSQL_DATABASE=${MYSQL_DATABASE}
86+
87+
# Mongo 세팅
88+
- MONGO_HOST=${MONGO_HOST}
89+
- MONGO_USER=${MONGO_USER}
90+
- MONGO_PASSWORD=${MONGO_PASSWORD}
91+
- MONGO_DB=${MONGO_DB}
92+
- LOG_LEVEL=${LOG_LEVEL}
93+
94+
# Redis 세팅
95+
- REDIS_USERNAME=${REDIS_USERNAME}
96+
- REDIS_PASSWORD=${REDIS_PASSWORD}
97+
- REDIS_HOST=${REDIS_HOST}
98+
- REDIS_PORT=${REDIS_PORT}
99+
100+
- WS_PORT=${WS2_PORT}
101+
networks:
102+
- app-network
19103
api:
20104
container_name: api
21105
ports:

‎docker-compose.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
services:
2-
api:
3-
build:
4-
context: .
5-
dockerfile: ./packages/api/Dockerfile
6-
restart: unless-stopped
7-
environment:
8-
- NODE_ENV=development
9-
networks:
10-
- app-network
11-
12-
frontend:
13-
build:
14-
context: .
15-
dockerfile: ./packages/frontend/Dockerfile
16-
restart: unless-stopped
17-
environment:
18-
- NODE_ENV=development
19-
networks:
20-
- app-network
21-
221
networks:
232
app-network:
243
driver: bridge

‎packages/.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MONGO_USER=your-mongo-username
1111
MONGO_PASSWORD=your-mongo-password
1212
MONGO_DB=your-mongo-database
1313

14-
# Redis 설정 (추가된 telnet 기반 체크를 위해 필요)
14+
# Redis 설정
1515
REDIS_HOST=your-redis-host
1616
REDIS_PORT=6379
1717

‎packages/api/src/app.module.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { getTypeOrmConfig } from './common/config/typeorm.config';
88
import { NoteModule } from './note/note.module';
99
import { SpaceModule } from './space/space.module';
1010
import { TestModule } from './test/test.module';
11+
import { ValidationModule } from './common/validation/validation.module';
1112

1213
@Module({
1314
imports: [
@@ -22,8 +23,9 @@ import { TestModule } from './test/test.module';
2223
inject: [ConfigService],
2324
useFactory: getTypeOrmConfig,
2425
}),
25-
SpaceModule,
26+
ValidationModule,
2627
NoteModule,
28+
SpaceModule,
2729
TestModule,
2830
],
2931
})

‎packages/api/src/common/validation/validation.module.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Module } from '@nestjs/common';
2+
import { MongooseModule } from '@nestjs/mongoose';
3+
import { NoteDocument, NoteSchema } from 'src/note/note.schema';
4+
import { SpaceDocument, SpaceSchema } from 'src/space/space.schema';
5+
import { ValidationService } from './validation.service';
6+
7+
@Module({
8+
imports: [
9+
MongooseModule.forFeature([
10+
{ name: NoteDocument.name, schema: NoteSchema },
11+
{ name: SpaceDocument.name, schema: SpaceSchema },
12+
]),
13+
],
14+
providers: [ValidationService],
15+
exports: [ValidationService],
16+
})
17+
export class ValidationModule {}

‎packages/api/src/common/validation/validation.service.spec.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { Test, TestingModule } from '@nestjs/testing';
2+
import { ValidationService } from './validation.service';
3+
4+
describe('ValidationService', () => {
5+
let service: ValidationService;
6+
7+
beforeEach(async () => {
8+
const module: TestingModule = await Test.createTestingModule({
9+
providers: [ValidationService],
10+
}).compile();
11+
12+
service = module.get<ValidationService>(ValidationService);
13+
});
14+
15+
it('should be defined', () => {
16+
expect(service).toBeDefined();
17+
});
18+
});

0 commit comments

Comments
 (0)