summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamon Fernandez <ramon@mongodb.com>2017-10-23 12:08:09 -0400
committerRamon Fernandez <ramon@mongodb.com>2017-10-23 13:04:30 -0400
commit59cedee3230235f444e5f3675260e36095527158 (patch)
treea832b5d4cbc40c569623c2318284b3ee8b0f6c9b
parent5f92390347b64fd4ce501c39f78f853be107271c (diff)
downloadmongo-59cedee3230235f444e5f3675260e36095527158.tar.gz
SERVER-31545 Remove deprecated mongooplog tool
-rw-r--r--README1
-rw-r--r--debian/mongodb-enterprise-unstable.rules2
-rw-r--r--debian/mongodb-enterprise.rules2
-rw-r--r--debian/mongodb-org-unstable.rules2
-rw-r--r--debian/mongodb-org.rules2
-rw-r--r--debian/mongooplog.1488
-rw-r--r--distsrc/README1
-rw-r--r--etc/evergreen.yml4
-rw-r--r--etc/perf.yml4
-rw-r--r--etc/system_perf.yml2
-rw-r--r--jstests/tool/oplog1.js29
-rw-r--r--jstests/tool/oplog_all_ops.js63
-rw-r--r--jstests/tool/tool_replset.js31
-rw-r--r--rpm/mongodb-enterprise-init.spec2
-rw-r--r--rpm/mongodb-enterprise-unstable-init.spec2
-rw-r--r--rpm/mongodb-enterprise-unstable.spec2
-rw-r--r--rpm/mongodb-enterprise.spec2
-rw-r--r--rpm/mongodb-org-init.spec2
-rw-r--r--rpm/mongodb-org-unstable-init.spec2
-rw-r--r--rpm/mongodb-org-unstable.spec2
-rw-r--r--rpm/mongodb-org.spec2
-rw-r--r--src/mongo/SConscript2
-rw-r--r--src/mongo/installer/msi/wxs/BinaryFragment.wxs4
-rw-r--r--src/mongo/installer/msi/wxs/FeatureFragment.wxs5
24 files changed, 12 insertions, 646 deletions
diff --git a/README b/README
index ab71a40b425..79dfed79170 100644
--- a/README
+++ b/README
@@ -17,7 +17,6 @@ UTILITIES
mongofiles - Put, get and delete files from GridFS.
mongostat - Show the status of a running mongod/mongos.
bsondump - Convert BSON files into human-readable formats.
- mongooplog - Poll the oplog and apply to a local server.
mongoreplay - Traffic capture and replay tool.
mongotop - Track time spent reading and writing data.
diff --git a/debian/mongodb-enterprise-unstable.rules b/debian/mongodb-enterprise-unstable.rules
index dcfd78abef4..92af42de620 100644
--- a/debian/mongodb-enterprise-unstable.rules
+++ b/debian/mongodb-enterprise-unstable.rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-TOOLS=bsondump mongodecrypt mongodump mongoexport mongofiles mongoimport mongoldap mongooplog mongoperf mongorestore mongostat mongotop
+TOOLS=bsondump mongodecrypt mongodump mongoexport mongofiles mongoimport mongoldap mongoperf mongorestore mongostat mongotop
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
diff --git a/debian/mongodb-enterprise.rules b/debian/mongodb-enterprise.rules
index 70aed7e0687..228e99df871 100644
--- a/debian/mongodb-enterprise.rules
+++ b/debian/mongodb-enterprise.rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-TOOLS=bsondump mongodecrypt mongodump mongoexport mongofiles mongoimport mongoldap mongooplog mongoperf mongorestore mongostat mongotop
+TOOLS=bsondump mongodecrypt mongodump mongoexport mongofiles mongoimport mongoldap mongoperf mongorestore mongostat mongotop
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
diff --git a/debian/mongodb-org-unstable.rules b/debian/mongodb-org-unstable.rules
index 5af48203cb0..fbec3b29891 100644
--- a/debian/mongodb-org-unstable.rules
+++ b/debian/mongodb-org-unstable.rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-TOOLS=bsondump mongodump mongoexport mongofiles mongoimport mongooplog mongoperf mongorestore mongostat mongotop
+TOOLS=bsondump mongodump mongoexport mongofiles mongoimport mongoperf mongorestore mongostat mongotop
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
diff --git a/debian/mongodb-org.rules b/debian/mongodb-org.rules
index b0e24542a0c..122b4ba252a 100644
--- a/debian/mongodb-org.rules
+++ b/debian/mongodb-org.rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-TOOLS=bsondump mongodump mongoexport mongofiles mongoimport mongooplog mongoperf mongorestore mongostat mongotop
+TOOLS=bsondump mongodump mongoexport mongofiles mongoimport mongoperf mongorestore mongostat mongotop
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
diff --git a/debian/mongooplog.1 b/debian/mongooplog.1
deleted file mode 100644
index 92077a20cb1..00000000000
--- a/debian/mongooplog.1
+++ /dev/null
@@ -1,488 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "MONGOOPLOG" "1" "January 30, 2015" "3.0" "mongodb-manual"
-.SH NAME
-mongooplog \- MongoDB Oplog Utility
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.sp
-New in version 2.2.
-
-.SH SYNOPSIS
-.sp
-\fBmongooplog\fP is a simple tool that polls operations from
-the \fIreplication\fP \fIoplog\fP of a remote server, and applies
-them to the local server. This capability supports certain classes of
-real\-time migrations that require that the source server remain online
-and in operation throughout the migration process.
-.sp
-Typically this command will take the following form:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-mongooplog \-\-from mongodb0.example.net \-\-host mongodb1.example.net
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-This command copies oplog entries from the \fBmongod\fP instance
-running on the host \fBmongodb0.example.net\fP and duplicates
-operations to the host \fBmongodb1.example.net\fP\&. If you do not need
-to keep the \fI\-\-from\fP host running during
-the migration, consider using \fBmongodump\fP and
-\fBmongorestore\fP or another \fBbackup\fP operation, which may be better suited to
-your operation.
-.sp
-\fBNOTE:\fP
-.INDENT 0.0
-.INDENT 3.5
-If the \fBmongod\fP instance specified by the \fI\-\-from\fP
-argument is running with \fBauthentication\fP, then
-\fBmongooplog\fP will not be able to copy oplog entries.
-.UNINDENT
-.UNINDENT
-.sp
-\fBSEE ALSO:\fP
-.INDENT 0.0
-.INDENT 3.5
-\fBmongodump\fP, \fBmongorestore\fP,
-http://docs.mongodb.org/manual/core/backups, http://docs.mongodb.org/manual/core/replica\-set\-oplog\&.
-.UNINDENT
-.UNINDENT
-.SH OPTIONS
-.sp
-Changed in version 3.0.0: \fBmongooplog\fP removed the \fB\-\-dbpath\fP as well as related
-\fB\-\-directoryperdb\fP and \fB\-\-journal\fP options. You must use
-\fBmongooplog\fP while connected to a \fBmongod\fP instance.
-
-.INDENT 0.0
-.TP
-.B mongooplog
-.UNINDENT
-.INDENT 0.0
-.TP
-.B mongooplog
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-help
-Returns information on the options and use of \fBmongooplog\fP\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-verbose, \-v
-Increases the amount of internal reporting returned on standard output
-or in log files. Increase the verbosity with the \fB\-v\fP form by
-including the option multiple times, (e.g. \fB\-vvvvv\fP\&.)
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-quiet
-Runs the \fBmongooplog\fP in a quiet mode that attempts to limit the amount
-of output.
-.sp
-This option suppresses:
-.INDENT 7.0
-.IP \(bu 2
-connection accepted events
-.IP \(bu 2
-connection closed events
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-version
-Returns the \fBmongooplog\fP release number.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-host <hostname><:port>, \-h <hostname><:port>
-Specifies a resolvable hostname for the \fBmongod\fP instance to
-which \fBmongooplog\fP will apply \fIoplog\fP operations
-retrieved from the server specified by the \fI\-\-from\fP option.
-.sp
-By default \fBmongooplog\fP attempts to connect to a MongoDB instance running
-on the localhost on port number \fB27017\fP\&.
-.sp
-To connect to a replica set, specify the \fBreplica set name\fP and a seed list of set members. Use the
-following form:
-.INDENT 7.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-<replSetName>/<hostname1><:port>,<hostname2><:port>,<...>
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-You can always connect directly to a single MongoDB instance by
-specifying the host and port number directly.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-port
-Specifies the port number of the \fBmongod\fP instance where
-\fBmongooplog\fP will apply \fIoplog\fP entries. Specify
-this option only if the MongoDB instance to connect to is not
-running on the standard port of \fB27017\fP\&. You may also specify a
-port number using the \fI\-\-host\fP command.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ipv6
-Enables IPv6 support and allows the \fBmongooplog\fP to connect to the
-MongoDB instance using an IPv6 network. All MongoDB programs and
-processes disable IPv6 support by default.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ssl
-New in version 2.6.
-
-.sp
-Enables connection to a \fBmongod\fP or \fBmongos\fP that has
-SSL support enabled.
-.sp
-The default distribution of MongoDB does not contain support for SSL.
-For more information on MongoDB and SSL, see http://docs.mongodb.org/manual/tutorial/configure\-ssl\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-sslCAFile <filename>
-New in version 2.6.
-
-.sp
-Specifies the \fB\&.pem\fP file that contains the root certificate chain
-from the Certificate Authority. Specify the file name of the
-\fB\&.pem\fP file using relative or absolute paths.
-.sp
-The default distribution of MongoDB does not contain support for SSL.
-For more information on MongoDB and SSL, see http://docs.mongodb.org/manual/tutorial/configure\-ssl\&.
-.sp
-\fBWARNING:\fP
-.INDENT 7.0
-.INDENT 3.5
-If the \fBmongo\fP shell or any other tool that connects to
-\fBmongos\fP or \fBmongod\fP is run without
-\fI\-\-sslCAFile\fP, it will not attempt to validate
-server certificates. This results in vulnerability to expired
-\fBmongod\fP and \fBmongos\fP certificates as well as to foreign
-processes posing as valid \fBmongod\fP or \fBmongos\fP
-instances. Ensure that you \fIalways\fP specify the CA file against which
-server certificates should be validated in cases where intrusion is a
-possibility.
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-sslPEMKeyFile <filename>
-New in version 2.6.
-
-.sp
-Specifies the \fB\&.pem\fP file that contains both the SSL certificate
-and key. Specify the file name of the \fB\&.pem\fP file using relative
-or absolute paths.
-.sp
-This option is required when using the \fI\-\-ssl\fP option to connect
-to a \fBmongod\fP or \fBmongos\fP that has
-\fBCAFile\fP enabled \fIwithout\fP
-\fBallowConnectionsWithoutCertificates\fP\&.
-.sp
-The default distribution of MongoDB does not contain support for SSL.
-For more information on MongoDB and SSL, see http://docs.mongodb.org/manual/tutorial/configure\-ssl\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-sslPEMKeyPassword <value>
-New in version 2.6.
-
-.sp
-Specifies the password to de\-crypt the certificate\-key file (i.e.
-\fI\-\-sslPEMKeyFile\fP). Use the \fI\-\-sslPEMKeyPassword\fP option only if the
-certificate\-key file is encrypted. In all cases, the \fBmongooplog\fP will
-redact the password from all logging and reporting output.
-.sp
-If the private key in the PEM file is encrypted and you do not specify
-the \fI\-\-sslPEMKeyPassword\fP option, the \fBmongooplog\fP will prompt for a passphrase. See
-\fIssl\-certificate\-password\fP\&.
-.sp
-The default distribution of MongoDB does not contain support for SSL.
-For more information on MongoDB and SSL, see http://docs.mongodb.org/manual/tutorial/configure\-ssl\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-sslCRLFile <filename>
-New in version 2.6.
-
-.sp
-Specifies the \fB\&.pem\fP file that contains the Certificate Revocation
-List. Specify the file name of the \fB\&.pem\fP file using relative or
-absolute paths.
-.sp
-The default distribution of MongoDB does not contain support for SSL.
-For more information on MongoDB and SSL, see http://docs.mongodb.org/manual/tutorial/configure\-ssl\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-sslAllowInvalidCertificates
-New in version 2.6.
-
-.sp
-Bypasses the validation checks for server certificates and allows
-the use of invalid certificates. When using the
-\fBallowInvalidCertificates\fP setting, MongoDB logs as a
-warning the use of the invalid certificate.
-.sp
-The default distribution of MongoDB does not contain support for SSL.
-For more information on MongoDB and SSL, see http://docs.mongodb.org/manual/tutorial/configure\-ssl\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-sslAllowInvalidHostnames
-New in version 3.0.
-
-.sp
-Disables the validation of the hostnames in SSL certificates. Allows
-\fBmongooplog\fP to connect to MongoDB instances if the hostname their
-certificates do not match the specified hostname.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-sslFIPSMode
-New in version 2.6.
-
-.sp
-Directs the \fBmongooplog\fP to use the FIPS mode of the installed OpenSSL
-library. Your system must have a FIPS compliant OpenSSL library to use
-the \fI\-\-sslFIPSMode\fP option.
-.sp
-\fBNOTE:\fP
-.INDENT 7.0
-.INDENT 3.5
-FIPS Compatible SSL is
-available only in \fI\%MongoDB Enterprise\fP\&. See
-http://docs.mongodb.org/manual/tutorial/configure\-fips for more information.
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-username <username>, \-u <username>
-Specifies a username with which to authenticate to a MongoDB database
-that uses authentication. Use in conjunction with the \fB\-\-password\fP and
-\fB\-\-authenticationDatabase\fP options.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-password <password>, \-p <password>
-Specifies a password with which to authenticate to a MongoDB database
-that uses authentication. Use in conjunction with the \fB\-\-username\fP and
-\fB\-\-authenticationDatabase\fP options.
-.sp
-If you do not specify an argument for \fI\-\-password\fP, \fBmongooplog\fP will
-prompt interactively for a password on the console.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-authenticationDatabase <dbname>
-New in version 2.4.
-
-.sp
-Specifies the database that holds the user\(aqs credentials.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-authenticationMechanism <name>
-\fIDefault\fP: MONGODB\-CR
-.sp
-New in version 2.4.
-
-.sp
-Changed in version 2.6: Added support for the \fBPLAIN\fP and \fBMONGODB\-X509\fP authentication
-mechanisms.
-
-.sp
-Specifies the authentication mechanism the \fBmongooplog\fP instance uses to
-authenticate to the \fBmongod\fP or \fBmongos\fP\&.
-.TS
-center;
-|l|l|.
-_
-T{
-Value
-T} T{
-Description
-T}
-_
-T{
-MONGODB\-CR
-T} T{
-MongoDB challenge/response authentication.
-T}
-_
-T{
-MONGODB\-X509
-T} T{
-MongoDB SSL certificate authentication.
-T}
-_
-T{
-PLAIN
-T} T{
-External authentication using LDAP. You can also use \fBPLAIN\fP
-for authenticating in\-database users. \fBPLAIN\fP transmits
-passwords in plain text. This mechanism is available only in
-\fI\%MongoDB Enterprise\fP\&.
-T}
-_
-T{
-GSSAPI
-T} T{
-External authentication using Kerberos. This mechanism is
-available only in \fI\%MongoDB Enterprise\fP\&.
-T}
-_
-.TE
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-gssapiServiceName
-New in version 2.6.
-
-.sp
-Specify the name of the service using \fBGSSAPI/Kerberos\fP\&. Only required if the service does not use the
-default name of \fBmongodb\fP\&.
-.sp
-This option is available only in MongoDB Enterprise.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-gssapiHostName
-New in version 2.6.
-
-.sp
-Specify the hostname of a service using \fBGSSAPI/Kerberos\fP\&. \fIOnly\fP required if the hostname of a machine does
-not match the hostname resolved by DNS.
-.sp
-This option is available only in MongoDB Enterprise.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-db <database>, \-d <database>
-Specifies the name of the database on which to run the \fBmongooplog\fP\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-collection <collection>, \-c <collection>
-Specifies the collection to export.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-seconds <number>, \-s <number>
-Specify a number of seconds of operations for \fBmongooplog\fP to
-pull from the \fIremote host\fP\&. Unless
-specified the default value is \fB86400\fP seconds, or 24 hours.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-from <host[:port]>
-Specify the host for \fBmongooplog\fP to retrieve \fIoplog\fP
-operations from. \fBmongooplog\fP \fIrequires\fP this option.
-.sp
-Unless you specify the \fI\-\-host\fP option,
-\fBmongooplog\fP will apply the operations collected with this
-option to the oplog of the \fBmongod\fP instance running on the
-localhost interface connected to port \fB27017\fP\&.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-oplogns <namespace>
-Specify a namespace in the \fI\-\-from\fP host
-where the oplog resides. The default value is \fBlocal.oplog.rs\fP, which
-is the where \fIreplica set\fP members store their operation log.
-However, if you\(aqve copied \fIoplog\fP entries into another
-database or collection or are pulling oplog entries from a
-\fBmaster\-slave\fP deployment, use \fI\%\-\-oplogns\fP to
-apply oplog entries stored in another location. Namespaces take the
-form of \fB[database].[collection]\fP\&.
-.UNINDENT
-.SH USE
-.sp
-Consider the following prototype \fBmongooplog\fP command:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-mongooplog \-\-from mongodb0.example.net \-\-host mongodb1.example.net
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Here, entries from the \fIoplog\fP of the \fBmongod\fP running
-on port \fB27017\fP\&. This only pull entries from the last 24 hours.
-.sp
-Use the \fI\-\-seconds\fP argument to capture
-a greater or smaller amount of time. Consider the following example:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-mongooplog \-\-from mongodb0.example.net \-\-seconds 172800
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-In this operation, \fBmongooplog\fP captures 2 full days of
-operations. To migrate 12 hours of \fIoplog\fP entries, use the
-following form:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-mongooplog \-\-from mongodb0.example.net \-\-seconds 43200
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SH AUTHOR
-MongoDB Documentation Project
-.SH COPYRIGHT
-2011-2015
-.\" Generated by docutils manpage writer.
-.
diff --git a/distsrc/README b/distsrc/README
index ab71a40b425..79dfed79170 100644
--- a/distsrc/README
+++ b/distsrc/README
@@ -17,7 +17,6 @@ UTILITIES
mongofiles - Put, get and delete files from GridFS.
mongostat - Show the status of a running mongod/mongos.
bsondump - Convert BSON files into human-readable formats.
- mongooplog - Poll the oplog and apply to a local server.
mongoreplay - Traffic capture and replay tool.
mongotop - Track time spent reading and writing data.
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index db1370b9380..13a00196a71 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -442,7 +442,7 @@ functions:
. ./${set_tools_gopath|set_gopath.sh}
- build_tools="bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog"
+ build_tools="bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop"
if [ "${build_mongoreplay}" = "true" ]; then
build_tools="$build_tools mongoreplay"
@@ -1711,7 +1711,7 @@ timeout:
${set_sudo}
fi
- hang_analyzer_option="-o file -o stdout -p ${hang_analyzer_processes|dbtest,java,mongo,mongod,mongos,python,_test} -g bsondump,mongodump,mongoexport,mongofiles,mongoimport,mongooplog,mongoreplay,mongorestore,mongostat,mongotop"
+ hang_analyzer_option="-o file -o stdout -p ${hang_analyzer_processes|dbtest,java,mongo,mongod,mongos,python,_test} -g bsondump,mongodump,mongoexport,mongofiles,mongoimport,mongoreplay,mongorestore,mongostat,mongotop"
if [ ${hang_analyzer_dump_core|true} = true ]; then
hang_analyzer_option="-c $hang_analyzer_option"
diff --git a/etc/perf.yml b/etc/perf.yml
index 82f681570da..c461c426087 100644
--- a/etc/perf.yml
+++ b/etc/perf.yml
@@ -6,7 +6,7 @@ pre:
params:
silent: true
script: |
- ${killall_mci|pkill -9 mongod; pkill -9 mongos; pkill -9 mongo; pkill -9 bsondump; pkill -9 mongoimport; pkill -9 mongoexport; pkill -9 mongodump; pkill -9 mongorestore; pkill -9 mongostat; pkill -9 mongofiles; pkill -9 mongooplog; pkill -9 mongotop; pkill -9 mongobridge; pkill -9 mongod-2.6; pkill -9 mongos-2.6; pkill -9 mongo-2.6; pkill -9 bsondump-2.6; pkill -9 mongoimport-2.6; pkill -9 mongoexport-2.6; pkill -9 mongodump-2.6; pkill -9 mongorestore-2.6; pkill -9 mongostat-2.6; pkill -9 mongofiles-2.6; pkill -9 mongooplog-2.6; pkill -9 mongotop-2.6; pkill -9 mongobridge-2.6; pkill -9 mongod-2.4; pkill -9 mongos-2.4; pkill -9 mongo-2.4; pkill -9 bsondump-2.4; pkill -9 mongoimport-2.4; pkill -9 mongoexport-2.4; pkill -9 mongodump-2.4; pkill -9 mongorestore-2.4; pkill -9 mongostat-2.4; pkill -9 mongofiles-2.4; pkill -9 mongooplog-2.4; pkill -9 mongotop-2.4; pkill -9 resmoke.py; pkill -9 python; pkill -9 python2; pkill -9 lldb; pkill -9 _test} >/dev/null 2>&1
+ ${killall_mci|pkill -9 mongod; pkill -9 mongos; pkill -9 mongo; pkill -9 bsondump; pkill -9 mongoimport; pkill -9 mongoexport; pkill -9 mongodump; pkill -9 mongorestore; pkill -9 mongostat; pkill -9 mongofiles; pkill -9 mongotop; pkill -9 mongobridge; pkill -9 mongod-2.6; pkill -9 mongos-2.6; pkill -9 mongo-2.6; pkill -9 bsondump-2.6; pkill -9 mongoimport-2.6; pkill -9 mongoexport-2.6; pkill -9 mongodump-2.6; pkill -9 mongorestore-2.6; pkill -9 mongostat-2.6; pkill -9 mongofiles-2.6; pkill -9 mongotop-2.6; pkill -9 mongobridge-2.6; pkill -9 mongod-2.4; pkill -9 mongos-2.4; pkill -9 mongo-2.4; pkill -9 bsondump-2.4; pkill -9 mongoimport-2.4; pkill -9 mongoexport-2.4; pkill -9 mongodump-2.4; pkill -9 mongorestore-2.4; pkill -9 mongostat-2.4; pkill -9 mongofiles-2.4; pkill -9 mongotop-2.4; pkill -9 resmoke.py; pkill -9 python; pkill -9 python2; pkill -9 lldb; pkill -9 _test} >/dev/null 2>&1
exit 0
post:
@@ -27,7 +27,7 @@ post:
params:
silent: true
script: |
- ${killall_mci|pkill -9 mongod; pkill -9 mongos; pkill -9 mongo; pkill -9 bsondump; pkill -9 mongoimport; pkill -9 mongoexport; pkill -9 mongodump; pkill -9 mongorestore; pkill -9 mongostat; pkill -9 mongofiles; pkill -9 mongooplog; pkill -9 mongotop; pkill -9 mongobridge; pkill -9 mongod-2.6; pkill -9 mongos-2.6; pkill -9 mongo-2.6; pkill -9 bsondump-2.6; pkill -9 mongoimport-2.6; pkill -9 mongoexport-2.6; pkill -9 mongodump-2.6; pkill -9 mongorestore-2.6; pkill -9 mongostat-2.6; pkill -9 mongofiles-2.6; pkill -9 mongooplog-2.6; pkill -9 mongotop-2.6; pkill -9 mongobridge-2.6; pkill -9 mongod-2.4; pkill -9 mongos-2.4; pkill -9 mongo-2.4; pkill -9 bsondump-2.4; pkill -9 mongoimport-2.4; pkill -9 mongoexport-2.4; pkill -9 mongodump-2.4; pkill -9 mongorestore-2.4; pkill -9 mongostat-2.4; pkill -9 mongofiles-2.4; pkill -9 mongooplog-2.4; pkill -9 mongotop-2.4; pkill -9 resmoke.py; pkill -9 python; pkill -9 python2; pkill -9 lldb; pkill -9 _test} >/dev/null 2>&1
+ ${killall_mci|pkill -9 mongod; pkill -9 mongos; pkill -9 mongo; pkill -9 bsondump; pkill -9 mongoimport; pkill -9 mongoexport; pkill -9 mongodump; pkill -9 mongorestore; pkill -9 mongostat; pkill -9 mongofiles; pkill -9 mongotop; pkill -9 mongobridge; pkill -9 mongod-2.6; pkill -9 mongos-2.6; pkill -9 mongo-2.6; pkill -9 bsondump-2.6; pkill -9 mongoimport-2.6; pkill -9 mongoexport-2.6; pkill -9 mongodump-2.6; pkill -9 mongorestore-2.6; pkill -9 mongostat-2.6; pkill -9 mongofiles-2.6; pkill -9 mongotop-2.6; pkill -9 mongobridge-2.6; pkill -9 mongod-2.4; pkill -9 mongos-2.4; pkill -9 mongo-2.4; pkill -9 bsondump-2.4; pkill -9 mongoimport-2.4; pkill -9 mongoexport-2.4; pkill -9 mongodump-2.4; pkill -9 mongorestore-2.4; pkill -9 mongostat-2.4; pkill -9 mongofiles-2.4; pkill -9 mongotop-2.4; pkill -9 resmoke.py; pkill -9 python; pkill -9 python2; pkill -9 lldb; pkill -9 _test} >/dev/null 2>&1
exit 0
- command: shell.exec
params:
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index 86b0c82363d..9e3f6d733f2 100644
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -289,7 +289,7 @@ tasks:
sed -i.bak "s/built-without-version-string/$(git describe)/" common/options/options.go
sed -i.bak "s/built-without-git-spec/$(git rev-parse HEAD)/" common/options/options.go
. ./${set_tools_gopath|set_gopath.sh}
- build_tools="bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog"
+ build_tools="bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop"
if [ "${build_mongoreplay}" = "true" ]; then
build_tools="$build_tools mongoreplay"
fi
diff --git a/jstests/tool/oplog1.js b/jstests/tool/oplog1.js
deleted file mode 100644
index ad8146c080e..00000000000
--- a/jstests/tool/oplog1.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// oplog1.js
-
-// very basic test for mongooplog
-// need a lot more, but test that it functions at all
-
-t = new ToolTest("oplog1");
-
-db = t.startDB();
-
-output = db.output;
-
-doc = {
- _id: 5,
- x: 17
-};
-
-assert.commandWorked(db.createCollection(output.getName()));
-
-db.oplog.insert({ts: new Timestamp(), "op": "i", "ns": output.getFullName(), "o": doc});
-
-assert.eq(0, output.count(), "before");
-
-t.runTool("oplog", "--oplogns", db.getName() + ".oplog", "--from", "127.0.0.1:" + t.port, "-vv");
-
-assert.eq(1, output.count(), "after");
-
-assert.docEq(doc, output.findOne(), "after check");
-
-t.stop();
diff --git a/jstests/tool/oplog_all_ops.js b/jstests/tool/oplog_all_ops.js
deleted file mode 100644
index 9221a7a7f9b..00000000000
--- a/jstests/tool/oplog_all_ops.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Performs a simple test on mongooplog by doing different types of operations
- * that will show up in the oplog then replaying it on another replica set.
- * Correctness is verified using the dbhash command.
- */
-
-var repl1 =
- new ReplSetTest({name: 'rs1', nodes: [{nopreallocj: ''}, {arbiter: true}, {arbiter: true}]});
-
-repl1.startSet({oplogSize: 10});
-repl1.initiate();
-repl1.awaitSecondaryNodes();
-
-var repl1Conn = new Mongo(repl1.getURL());
-var testDB = repl1Conn.getDB('test');
-var testColl = testDB.user;
-
-// op i
-testColl.insert({x: 1});
-testColl.insert({x: 2});
-
-// op c
-testColl.drop();
-
-testColl.insert({y: 1});
-testColl.insert({y: 2});
-testColl.insert({y: 3});
-
-// op u
-testColl.update({}, {$inc: {z: 1}}, true, true);
-
-// op d
-testColl.remove({y: 2});
-
-// op n
-var oplogColl = repl1Conn.getCollection('local.oplog.rs');
-oplogColl.insert({ts: new Timestamp(), op: 'n', ns: testColl.getFullName(), 'o': {x: 'noop'}});
-
-var repl2 =
- new ReplSetTest({name: 'rs2', nodes: [{nopreallocj: ''}, {arbiter: true}, {arbiter: true}]});
-
-repl2.startSet({oplogSize: 10});
-repl2.initiate();
-repl2.awaitSecondaryNodes();
-
-var srcConn = repl1.getPrimary();
-var exitCode = MongoRunner.runMongoTool('mongooplog', {
- from: repl1.getPrimary().host,
- host: repl2.getPrimary().host,
-});
-assert.eq(0, exitCode, 'mongooplog failed to poll operations from rs1 and apply them to rs2');
-
-var repl1Hash = testDB.runCommand({dbhash: 1});
-
-var repl2Conn = new Mongo(repl2.getURL());
-var testDB2 = repl2Conn.getDB(testDB.getName());
-var repl2Hash = testDB2.runCommand({dbhash: 1});
-
-assert(repl1Hash.md5);
-assert.eq(repl1Hash.md5, repl2Hash.md5);
-
-repl1.stopSet();
-repl2.stopSet();
diff --git a/jstests/tool/tool_replset.js b/jstests/tool/tool_replset.js
index 724927f6933..fbffec51aca 100644
--- a/jstests/tool/tool_replset.js
+++ b/jstests/tool/tool_replset.js
@@ -8,10 +8,6 @@
* 6. Export a collection.
* 7. Drop the collection.
* 8. Import the collection.
- * 9. Add data to the oplog.rs collection.
- * 10. Ensure that the document doesn't exist yet.
- * 11. Now play the mongooplog tool.
- * 12. Make sure that the oplog was played
*/
(function() {
@@ -90,33 +86,6 @@
var x = master.getDB("foo").getCollection("bar").count();
assert.eq(x, 100, "mongoimport should have successfully imported the collection");
- var doc = {_id: 5, x: 17};
- var oplogEntry = {ts: new Timestamp(), "op": "i", "ns": "foo.bar", "o": doc, "v": NumberInt(2)};
- assert.writeOK(master.getDB("local").oplog.rs.insert(oplogEntry));
-
- assert.eq(100,
- master.getDB("foo").getCollection("bar").count(),
- "count before running mongooplog was not 100 as expected");
-
- exitCode = MongoRunner.runMongoTool("mongooplog", {
- from: "127.0.0.1:" + replTest.ports[0],
- host: replSetConnString,
- });
- assert.eq(0, exitCode, "mongooplog failed to replay the oplog");
-
- print("finished running mongooplog to replay the oplog");
-
- var foundDocs = master.getDB("foo").getCollection("bar").find({_id: 5}).toArray();
- assert.eq(foundDocs.length, 1, "mongooplog expected to have inserted one document");
- assert.docEq(foundDocs[0], doc, "document inserted by mongooplog expected to match");
- // assert.soon(function() {
- // var numDocs = master.getDB("foo").getCollection("bar").count();
- // if (numDocs == 101) {
- // return true;
- // }
- // return false;
- // }, "count after running " + "mongooplog was not 101 as expected");
-
print("all tests successful, stopping replica set");
replTest.stopSet();
diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec
index ab2c0b62cfe..78f04f08cc6 100644
--- a/rpm/mongodb-enterprise-init.spec
+++ b/rpm/mongodb-enterprise-init.spec
@@ -265,7 +265,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -276,7 +275,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/rpm/mongodb-enterprise-unstable-init.spec b/rpm/mongodb-enterprise-unstable-init.spec
index ef1eac81c9c..55d25d17877 100644
--- a/rpm/mongodb-enterprise-unstable-init.spec
+++ b/rpm/mongodb-enterprise-unstable-init.spec
@@ -254,7 +254,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -265,7 +264,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec
index 414fec384d7..16b32774eeb 100644
--- a/rpm/mongodb-enterprise-unstable.spec
+++ b/rpm/mongodb-enterprise-unstable.spec
@@ -251,7 +251,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -262,7 +261,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec
index 90ebb318481..c4476280cf4 100644
--- a/rpm/mongodb-enterprise.spec
+++ b/rpm/mongodb-enterprise.spec
@@ -261,7 +261,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -272,7 +271,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec
index f51e4e394e7..8bc85f2a2a7 100644
--- a/rpm/mongodb-org-init.spec
+++ b/rpm/mongodb-org-init.spec
@@ -258,7 +258,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -269,7 +268,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/rpm/mongodb-org-unstable-init.spec b/rpm/mongodb-org-unstable-init.spec
index 719d3992629..04575b90b3a 100644
--- a/rpm/mongodb-org-unstable-init.spec
+++ b/rpm/mongodb-org-unstable-init.spec
@@ -246,7 +246,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -257,7 +256,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec
index 1ea1739351a..7903d7067ab 100644
--- a/rpm/mongodb-org-unstable.spec
+++ b/rpm/mongodb-org-unstable.spec
@@ -242,7 +242,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -253,7 +252,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec
index 845215fd7aa..4bc3d6f4e48 100644
--- a/rpm/mongodb-org.spec
+++ b/rpm/mongodb-org.spec
@@ -254,7 +254,6 @@ fi
%{_bindir}/mongoexport
%{_bindir}/mongofiles
%{_bindir}/mongoimport
-%{_bindir}/mongooplog
%{_bindir}/mongoperf
%{_bindir}/mongorestore
%{_bindir}/mongotop
@@ -265,7 +264,6 @@ fi
%{_mandir}/man1/mongoexport.1*
%{_mandir}/man1/mongofiles.1*
%{_mandir}/man1/mongoimport.1*
-%{_mandir}/man1/mongooplog.1*
%{_mandir}/man1/mongoperf.1*
%{_mandir}/man1/mongorestore.1*
%{_mandir}/man1/mongotop.1*
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 60d3512f7aa..01ee3d571e0 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -332,7 +332,7 @@ mongod = env.Program(
env.Default(env.Install('#/', mongod))
# tools
-rewrittenTools = [ "mongodump", "mongorestore", "mongoexport", "mongoimport", "mongostat", "mongotop", "bsondump", "mongofiles", "mongooplog" ]
+rewrittenTools = [ "mongodump", "mongorestore", "mongoexport", "mongoimport", "mongostat", "mongotop", "bsondump", "mongofiles" ]
# mongoperf
env.Install(
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
index db3ffdf82f6..bfc4d8fd2d2 100644
--- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs
+++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
@@ -37,10 +37,6 @@
<File Id="f_mongoimport" Name="mongoimport.exe" Source="$(var.ToolBinarySource)\mongoimport.exe"
DiskId ="1" KeyPath="yes"/>
</Component>
- <Component Id="c_mongooplog" Guid="FAD84CBB-4666-4C22-A0DF-E1D2AEEC1601">
- <File Id="f_mongooplog" Name="mongooplog.exe" Source="$(var.ToolBinarySource)\mongooplog.exe"
- DiskId ="1" KeyPath="yes"/>
- </Component>
<Component Id="c_mongoperf" Guid="B046CCD2-39DC-4CB4-8A58-A7790148C41E">
<File Id="f_mongoperf" Name="mongoperf.exe" Source="$(var.BinarySource)\mongoperf.exe"
DiskId ="1" KeyPath="yes"/>
diff --git a/src/mongo/installer/msi/wxs/FeatureFragment.wxs b/src/mongo/installer/msi/wxs/FeatureFragment.wxs
index a8c65b61543..69e1c8f0db5 100644
--- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs
+++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs
@@ -2,9 +2,9 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<?if $(var.Edition) = Enterprise ?>
- <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongodecrypt, mongofiles, mongoldap, mongooplog, mongoperf)" />
+ <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongodecrypt, mongofiles, mongoldap, mongoperf)" />
<?else?>
- <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongofiles, mongooplog, mongoperf)" />
+ <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongofiles, mongoperf)" />
<?endif?>
<FeatureGroup Id="fg_MongoDBAll">
<Feature Id="ProductFeature"
@@ -88,7 +88,6 @@
Level ="1">
<ComponentRef Id="c_bsondump"/>
<ComponentRef Id="c_mongofiles"/>
- <ComponentRef Id="c_mongooplog"/>
<ComponentRef Id="c_mongoperf"/>
<?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseBase" />