From f22e2e9a02759d58c2a5177df4f25efce2df2704 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Thu, 17 Apr 2014 12:43:30 +1000 Subject: [PATCH] spelling corrections --- doc/dev/osd_internals/map_message_handling.rst | 2 +- doc/man/8/crushtool.rst | 2 +- doc/rados/troubleshooting/troubleshooting-mon.rst | 4 ++-- man/crushtool.8 | 2 +- src/crush/CrushCompiler.cc | 2 +- src/mon/Paxos.h | 4 ++-- src/osd/OSD.cc | 4 ++-- src/osd/PG.cc | 2 +- src/pybind/rados.py | 2 +- src/rgw/rgw_admin.cc | 2 +- src/test/cli/radosgw-admin/help.t | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/dev/osd_internals/map_message_handling.rst b/doc/dev/osd_internals/map_message_handling.rst index eb27396df3761..d7b4031beae3f 100644 --- a/doc/dev/osd_internals/map_message_handling.rst +++ b/doc/dev/osd_internals/map_message_handling.rst @@ -55,7 +55,7 @@ OSD::require_same_or_newer map checks that the current OSDMap is at least as new as the map epoch indicated on the message. If not, the message is queued in OSD::waiting_for_osdmap via OSD::wait_for_new_map. Note, this cannot violate the above conditions since any two messages will be queued -in order of receipt and if a message is recieved with epoch e0, a later message +in order of receipt and if a message is received with epoch e0, a later message from the same source must be at epoch at least e0. Note that two PGs from the same OSD count for these purposes as different sources for single PG messages. That is, messages from different PGs may be reordered. diff --git a/doc/man/8/crushtool.rst b/doc/man/8/crushtool.rst index 6995446049335..27f1de757a322 100644 --- a/doc/man/8/crushtool.rst +++ b/doc/man/8/crushtool.rst @@ -60,7 +60,7 @@ Running tests with --test The test mode will use the input crush map ( as specified with **-i map** ) and perform a dry run of CRUSH mapping or random placement ( if **--simulate** is set ). On completion, two kinds of reports can be -created. The **--show-...** options output human readable informations +created. The **--show-...** options output human readable information on stderr. The **--output-csv** option creates CSV files that are documented by the **--help-output** option. diff --git a/doc/rados/troubleshooting/troubleshooting-mon.rst b/doc/rados/troubleshooting/troubleshooting-mon.rst index 440fdd2a333a6..fa69ec862d81a 100644 --- a/doc/rados/troubleshooting/troubleshooting-mon.rst +++ b/doc/rados/troubleshooting/troubleshooting-mon.rst @@ -100,7 +100,7 @@ Understanding mon_status ``mon_status`` can be obtained through the ``ceph`` tool when you have a formed quorum, or via the admin socket if you don't. This command will -output a multitude of informations about the monitor, including the same +output a multitude of information about the monitor, including the same output you would get with ``quorum_status``. Take the following example of ``mon_status``:: @@ -282,7 +282,7 @@ In this sort of situations, you have two possible solutions: Scrap the monitor and create a new one You should only take this route if you are positive that you won't - lose the informations kept by that monitor; that you have other monitors + lose the information kept by that monitor; that you have other monitors and that they are running just fine so that your new monitor is able to synchronize from the remaining monitors. Keep in mind that destroying a monitor, if there are no other copies of its contents, may lead to diff --git a/man/crushtool.8 b/man/crushtool.8 index 38a379b40d2e8..bb518f7714d48 100644 --- a/man/crushtool.8 +++ b/man/crushtool.8 @@ -125,7 +125,7 @@ CEPH_ARGS="\-\-debug\-crush 0" crushtool ... The test mode will use the input crush map ( as specified with \fB\-i map\fP ) and perform a dry run of CRUSH mapping or random placement ( if \fB\-\-simulate\fP is set ). On completion, two kinds of reports can be -created. The \fB\-\-show\-...\fP options output human readable informations +created. The \fB\-\-show\-...\fP options output human readable information on stderr. The \fB\-\-output\-csv\fP option creates CSV files that are documented by the \fB\-\-help\-output\fP option. .INDENT 0.0 diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc index 6f87899b36d37..b52a55ad9d003 100644 --- a/src/crush/CrushCompiler.cc +++ b/src/crush/CrushCompiler.cc @@ -375,7 +375,7 @@ int CrushCompiler::parse_tunable(iter_t const& i) /* - current crop of tunables are all now "safe". reenable this when we + current crop of tunables are all now "safe". re-enable this when we add new ones that are ... new. if (!unsafe_tunables) { diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h index 764c4fee40443..b9e43a14c63ff 100644 --- a/src/mon/Paxos.h +++ b/src/mon/Paxos.h @@ -658,7 +658,7 @@ private: * onto the original Paxos' Prepare phase. Basically, we'll generate a * Proposal Number, taking @p oldpn into consideration, and we will send * it to a quorum, along with our first and last committed versions. By - * sending these informations in a message to the quorum, we expect to + * sending these information in a message to the quorum, we expect to * obtain acceptances from a majority, allowing us to commit, or be * informed of a higher Proposal Number known by one or more of the Peons * in the quorum. @@ -676,7 +676,7 @@ private: * accordingly. * * Once a Peon receives a collect message from the Leader it will reply - * with its first and last committed versions, as well as informations so + * with its first and last committed versions, as well as information so * the Leader may know if his Proposal Number was, or was not, accepted by * the Peon. The Peon will accept the Leader's Proposal Number iif it is * higher than the Peon's currently accepted Proposal Number. The Peon may diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 69faf9a315c2a..4b9f3a36946ca 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -6477,7 +6477,7 @@ void OSD::do_notifies( cluster_messenger->send_message(m, con.get()); } else { dout(7) << "do_notify osd " << it->first - << " sending seperate messages" << dendl; + << " sending separate messages" << dendl; for (vector >::iterator i = it->second.begin(); i != it->second.end(); @@ -6516,7 +6516,7 @@ void OSD::do_queries(map >& query_map, cluster_messenger->send_message(m, con.get()); } else { dout(7) << "do_queries querying osd." << who - << " sending seperate messages " + << " sending saperate messages " << " on " << pit->second.size() << " PGs" << dendl; for (map::iterator i = pit->second.begin(); i != pit->second.end(); diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 5a79ab98ba95e..7dd0acae8c2b5 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -6910,7 +6910,7 @@ boost::statechart::result PG::RecoveryState::GetLog::react(const MLogRec& logevt << "non-auth_log_shard osd." << logevt.from << dendl; return discard_event(); } - dout(10) << "GetLog: recieved master log from osd" + dout(10) << "GetLog: received master log from osd" << logevt.from << dendl; msg = logevt.msg; post_event(GotLog()); diff --git a/src/pybind/rados.py b/src/pybind/rados.py index 6d02d38581dd9..e5da0771771ae 100644 --- a/src/pybind/rados.py +++ b/src/pybind/rados.py @@ -383,7 +383,7 @@ Rados object in state %s." % (self.state)) Ping a monitor to assess liveness May be used as a simply way to assess liveness, or to obtain - informations about the monitor in a simple way even in the + information about the monitor in a simple way even in the absence of quorum. :param mon_id: the ID portion of the monitor's name (i.e., mon.) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index d1b7e961ff66c..ec83878037191 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -45,7 +45,7 @@ void _usage() cerr << " user info get user info\n"; cerr << " user rm remove user\n"; cerr << " user suspend suspend a user\n"; - cerr << " user enable reenable user after suspension\n"; + cerr << " user enable re-enable user after suspension\n"; cerr << " user check check user info\n"; cerr << " user stats show user stats as accounted by quota subsystem\n"; cerr << " caps add add user capabilities\n"; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index ca3e7471b10ab..a46d240d54cdc 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -6,7 +6,7 @@ user info get user info user rm remove user user suspend suspend a user - user enable reenable user after suspension + user enable re-enable user after suspension user check check user info user stats show user stats as accounted by quota subsystem caps add add user capabilities -- 2.39.5