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.

Sign up for GitHub

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

Jump to bottom

Коротких Виктор / ИТМО DWS / Stage 5 #190

Merged
merged 53 commits into from
May 14, 2024
Merged

Коротких Виктор / ИТМО DWS / Stage 5 #190

merged 53 commits into from
May 14, 2024

Conversation

vitekkor
Copy link
Contributor

@vitekkor vitekkor commented Apr 11, 2024 •
edited
Loading

  • Асинхронное взаимодействие
  • Отчёт link

vitekkor and others added 30 commits March 13, 2024 23:11
@vitekkor
stage-3: pre-start all threads
29a59e0
@vitekkor
stage-3: implement consistent hashing
b7db2f0
@vitekkor
stage-3: remove debug tmpDirs; remove unused imports
a9e4c0c
@vitekkor
stage-3: fix comments
bcf927f
@vitekkor
stage-3: close resources
1329fca
@vitekkor
stage-3: add local dev arg parsing
2953614
@vitekkor
Merge remote-tracking branch 'upstream/main' into stage-3
b76fcd6
@vitekkor
stage-3: add PUT results
959c689
@vitekkor
stage-3: use murmur hashing
3b56dac
@vitekkor
stage-3: minors
ddda31c
@vitekkor
stage-3: trigger build
51e494a
@vitekkor
stage-3: delete report
9501cb6
@vitekkor
stage-3: add put report
73e2acd
@vitekkor
stage-3: add get results
91c1c4d
@vitekkor
stage-3: add report
518d384
@vitekkor
Merge remote-tracking branch 'upstream/main' into stage-3
e9316eb
@vitekkor
stage-4: first try
4576c2b
@vitekkor
stage-4: fix tests
833a577
@vitekkor
stage-4: fix codestyle
a2486b9
@vitekkor
stage-4: fix codestyle 2
2d7329a
@vitekkor
stage-4: fix codestyle 3
76b6e40
@vitekkor
stage-4: provide new getting list of replicas algorithm
192a9c8
@vitekkor
stage-4: code refactoring
8eb201d
@vitekkor
Merge remote-tracking branch 'upstream/main' into stage-4
07f5e6e 
# Conflicts:
#	src/main/java/ru/vk/itmo/test/viktorkorotkikh/ConsistentHashingManager.java
#	src/main/java/ru/vk/itmo/test/viktorkorotkikh/LSMServerImpl.java
#	src/main/java/ru/vk/itmo/test/viktorkorotkikh/LSMServiceImpl.java
#	src/main/java/ru/vk/itmo/test/viktorkorotkikh/http/LSMConstantResponse.java
@vitekkor
stage-4: add report template
b00aaa1
@vitekkor
stage-4: alloc optimization
96d4db4
@vitekkor
stage-4: update report
ffd3aa2
@vitekkor
Merge remote-tracking branch 'upstream/main' into stage-4
f6f7fba
@incubos
Merge branch 'main' into stage-4
1726a36
@vitekkor
stage-4: fix comments (part 1)
9deef23
codeclimate[bot]
codeclimate bot reviewed Apr 17, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 13005 lines exceeds the maximum allowed for the inline comments feature.

codeclimate[bot]
codeclimate bot reviewed Apr 18, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 23589 lines exceeds the maximum allowed for the inline comments feature.

codeclimate[bot]
codeclimate bot reviewed Apr 21, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 23589 lines exceeds the maximum allowed for the inline comments feature.

atimofeyev
atimofeyev requested changes Apr 29, 2024
View reviewed changes
src/main/java/ru/vk/itmo/test/viktorkorotkikh/LSMServerImpl.java Outdated
for (final String replicaUrl : replicas) {
if (replicaUrl.equals(selfUrl)) {
responses.add(processLocal(request, key, id, requestTimestamp));
clusterResponseMerger.addToMerge(i, processLocal(request, key, id, requestTimestamp));
Copy link
Contributor

Choose a reason for hiding this comment

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

здесь мы делаем синхронный вызов к локальной реплике, что по условию не должно быть

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Согласен. Ошибся. Исправил, отчёт дополнил

codeclimate[bot]
codeclimate bot reviewed May 1, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 46223 lines exceeds the maximum allowed for the inline comments feature.

codeclimate[bot]
codeclimate bot reviewed May 1, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 46233 lines exceeds the maximum allowed for the inline comments feature.

@vitekkor vitekkor requested a review from atimofeyev May 1, 2024 09:43
codeclimate[bot]
codeclimate bot reviewed May 5, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 46233 lines exceeds the maximum allowed for the inline comments feature.

atimofeyev
atimofeyev reviewed May 5, 2024
View reviewed changes
src/main/java/ru/vk/itmo/test/viktorkorotkikh/util/ClusterResponseMerger.java Outdated
private final int allowedUnsuccessfulResponses;
private final Request originalRequest;
private final HttpSession session;
private final NodeResponse[] nodeResponses;
Copy link
Contributor

Choose a reason for hiding this comment

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

здесь могут быть проблемы в многопоточной среде, чтение/запись в массив идет из разных потоков. В таком случае просто final ссылка не поможет. Нужны какие-то примитивы синхронизации.

Подойдет как какая-нибудь потокобезопасная коллекция, так и AtomicReferenceArray

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Да, действительно. Затмил глаза этот word tearing с гарантиями записи из разных потоков в разным индексам массива. Заменил на AtomicReferenceArray

codeclimate[bot]
codeclimate bot reviewed May 9, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 46243 lines exceeds the maximum allowed for the inline comments feature.

codeclimate[bot]
codeclimate bot reviewed May 9, 2024
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 46247 lines exceeds the maximum allowed for the inline comments feature.

@vitekkor
Merge remote-tracking branch 'upstream/main' into stage-5
26b5e4c 
# Conflicts:
#	src/main/java/ru/vk/itmo/test/viktorkorotkikh/LSMServiceImpl.java
#	src/main/java/ru/vk/itmo/test/viktorkorotkikh/util/ClusterResponseMerger.java
#	src/main/java/ru/vk/itmo/test/viktorkorotkikh/util/LsmServerUtil.java
@vitekkor
Copy link
Contributor Author

@atimofeyev Добрый день! Так вышло, что Вадим вмерджил мой 6 stage в main раньше, чем 5й, поэтому я замерджил upstream и разрешил конфликты. Также вижу, что аппрув от вас есть, но нет оценки. Подскажите, пожалуйста, нужно ли от меня что-то ещё?

@atimofeyev
Copy link
Contributor

@atimofeyev Добрый день! Так вышло, что Вадим вмерджил мой 6 stage в main раньше, чем 5й, поэтому я замерджил upstream и разрешил конфликты. Также вижу, что аппрув от вас есть, но нет оценки. Подскажите, пожалуйста, нужно ли от меня что-то ещё?

нет, больше ничего не надо, занесу скоро оценку в ведомость

@atimofeyev atimofeyev merged commit 3c3ff98 into polis-vk:main May 14, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeclimate codeclimate[bot] codeclimate[bot] left review comments

@atimofeyev atimofeyev atimofeyev approved these changes

@vladimir-bf vladimir-bf Awaiting requested review from vladimir-bf

Assignees

@atimofeyev atimofeyev

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vitekkor @atimofeyev @vladimir-bf @incubos