You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/01/12 16:37:57 UTC
[1/2] allura git commit: [#8038] mongo 3 raises error when calling
index_information() on non-existant collection/db
Repository: allura
Updated Branches:
refs/heads/db/8038 [created] e0ef8b8ad
[#8038] mongo 3 raises error when calling index_information() on non-existant collection/db
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f31b4ee2
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f31b4ee2
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f31b4ee2
Branch: refs/heads/db/8038
Commit: f31b4ee2dce874a0074847d8d0d3e2a46b0982c0
Parents: a0f7f3d
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Jan 12 09:54:31 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Jan 12 09:54:31 2016 -0500
----------------------------------------------------------------------
Allura/allura/command/show_models.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f31b4ee2/Allura/allura/command/show_models.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/show_models.py b/Allura/allura/command/show_models.py
index 917f516..95f362b 100644
--- a/Allura/allura/command/show_models.py
+++ b/Allura/allura/command/show_models.py
@@ -22,7 +22,7 @@ from itertools import groupby
from paste.deploy.converters import asbool
from pylons import tmpl_context as c, app_globals as g
-from pymongo.errors import DuplicateKeyError, InvalidDocument
+from pymongo.errors import DuplicateKeyError, InvalidDocument, OperationFailure
from ming.orm import mapper, session, Mapper
from ming.orm.declarative import MappedClass
@@ -257,7 +257,12 @@ class EnsureIndexCommand(base.Command):
prev_uindexes = {}
unique_flag_drop = {}
unique_flag_add = {}
- for iname, fields in collection.index_information().iteritems():
+ try:
+ existing_indexes = collection.index_information().iteritems()
+ except OperationFailure:
+ # exception is raised if db or collection doesn't exist yet
+ existing_indexes = {}
+ for iname, fields in existing_indexes:
if iname == '_id_':
continue
keys = tuple(fields['key'])
[2/2] allura git commit: [#8038] update to latest mongo
Posted by br...@apache.org.
[#8038] update to latest mongo
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e0ef8b8a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e0ef8b8a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e0ef8b8a
Branch: refs/heads/db/8038
Commit: e0ef8b8adbe32635e6b2894a06389f669b9cda46
Parents: f31b4ee
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Jan 12 10:37:49 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Jan 12 10:37:49 2016 -0500
----------------------------------------------------------------------
Allura/docs/getting_started/installation.rst | 2 +-
docker-compose.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e0ef8b8a/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index c8f0156..ee52118 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -53,7 +53,7 @@ Before we begin, you'll need to install some system packages.
~$ sudo aptitude install git-core default-jre-headless python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
-To install MongoDB, follow the instructions `here <http://docs.mongodb.org/v2.6/tutorial/install-mongodb-on-ubuntu/>`_.
+To install MongoDB, follow the instructions `here <https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/>`_.
Optional, for SVN support:
http://git-wip-us.apache.org/repos/asf/allura/blob/e0ef8b8a/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 02fa2e4..af2decb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,12 +51,12 @@ solr:
- /allura-data/solr:/opt/solr/server/solr/allura/data
mongo:
- image: mongo:2.6
+ image: mongo:3.2
ports:
- "27017:27017"
volumes:
- /allura-data/mongo:/data/db
- command: mongod --smallfiles
+ command: mongod --storageEngine wiredTiger
outmail:
image: allura_web