8000 devel: fixed the missed changes to plan after agency callback is registred f… by kvahed · Pull Request #4775 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

devel: fixed the missed changes to plan after agency callback is registred f… #4775

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

Merged
merged 20 commits into from
Mar 14, 2018
Merged

devel: fixed the missed changes to plan after agency callback is registred f… #4775

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
83688a6
fixed the missed changes to plan after agency callback is registred f…
kvahed Mar 7, 2018
11e3d4f
fixed the missed changes to plan after agency callback is registred f…
kvahed Mar 7, 2018
a384c28
Force check in timeout case.
neunhoef Mar 8, 2018
ac0746c
More debugging in tests.
neunhoef Mar 8, 2018
23220f0
Merge remote-tracking branch 'origin/devel' into bug-fix/create-colle…
neunhoef Mar 8, 2018
56c1769
Fail in maintainer mode with some dump in the critical case.
neunhoef Mar 8, 2018
a43814c
Merge remote-tracking branch 'origin/devel' into bug-fix/create-colle…
neunhoef Mar 9, 2018
cb5c6c3
Fix Agent behaviour. RestAgencyHandler::inquire missing.
neunhoef Mar 9, 2018
a745a5d
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
kvahed Mar 12, 2018
c3a06a6
Sort out RestAgencyHandler behaviour for inquire.
neunhoef Mar 12, 2018
f28790f
Take "ongoing" stuff out of AgencyComm.
neunhoef Mar 12, 2018
c4ff2b4
Merge remote-tracking branch 'origin/devel' into bug-fix/create-colle…
neunhoef Mar 12, 2018
ba31cd8
Merge branch 'bug-fix/create-collection-coordinator-changes-to-plan-i…
kvahed Mar 12, 2018
d4d631c
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
kvahed Mar 12, 2018
30741b7
merged in devel / corrected for overly talkative log level
kvahed Mar 12, 2018
198fadb
no need for loadPlan anymore
kvahed Mar 12, 2018
99d15fc
Reinstate an erroreously remove loadPlan.
neunhoef Mar 12, 2018
975ac5e
Put loadPlan back in the right place.
neunhoef Mar 12, 2018
9b68c98
need to step up the logs again
kvahed Mar 12, 2018
e925fe3
Take debugging output out again for merging.
neunhoef Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
no need for loadPlan anymore
  • Loading branch information
@kvahed
kvahed committed Mar 12, 2018
commit 198fadb6862b0e0ca91465e475397a6f075cf171
2 changes: 0 additions & 2 deletions arangod/Cluster/ClusterInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,8 +1408,6 @@ int ClusterInfo::createCollectionCoordinator(std::string const& databaseName,
return setErrormsg(TRI_ERROR_CLUSTER_TIMEOUT, errorMsg);
}

// Reup plan, in case the servers have been updated in meantime
loadPlan();
agencyCallback->executeByCallbackOrTimeout(interval);
}
}
Expand Down
0