Added replicaset name to bigchaindb config #1063
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Current coverage is 96.76% (diff: 100%)
|
It now initializes the replica set with the name provided by the bigchaindb config file. Fixed tests.
This way we are sure that a replica set exists when we return a connection.
sbellem
reviewed
Jan 19, 2017
| port=bigchaindb.config['database']['port']) | ||
| _check_replica_set(conn) | ||
| config = {'_id': bigchaindb.config['database']['replicaset'], | ||
| 'members': [{'_id': 0, 'host': 'localhost:27017'}]} |
There was a problem hiding this comment.
I wonder: should we get the host and port from the config, for cases where the host and port differ from defaults?
sbellem
reviewed
Jan 19, 2017
| while True: | ||
| logs = conn.admin.command('getLog', 'rs')['log'] | ||
| if any('database writes are now permitted' in line for line in logs): | ||
| return |
There was a problem hiding this comment.
indentation is one tab off
sbellem
approved these changes
Jan 19, 2017
sbellem
reviewed
Jan 19, 2017
| initialize_replica_set() | ||
| self.connection = MongoClient(self.host, self.port, | ||
| replicaset=self.replicaset) | ||
| except errors.ConnectionFailure as exc: |
There was a problem hiding this comment.
we can discard the exc as it is not used
ttmc
approved these changes
Jan 20, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolves #1056
This pr adds
replicasettobigchaindb.config.Also updated the mongodb connection initialization to connect to a replica set, and moved the
initialize_replica_setintomongodb.connection. The reason for this is that the replicaset needs to be initialized before we even try to setup aMongoDBConnection