Skip to content

Commit

Permalink
Fix various typos, spelling and grammar errors
Browse files Browse the repository at this point in the history
Most of the fixed errors are in comments, but a few are in
messages from the system or build files.

Some examples:

- MogileFS.pm provides a the perl client for the MogileFS application-level
+ MogileFS.pm provides a perl client for the MogileFS application-level

-    ABSTRACT                => 'Plugin for mogilefs server represending a UNIX like filesystem on top of mogilefs.',
+    ABSTRACT                => 'Plugin for mogilefs server representing a UNIX like filesystem on top of mogilefs.',

-        des => "Comma-seperated list of filenames to load when a user visits a directory URL, listed in order of preference.",
+        des => "Comma-separated list of filenames to load when a user visits a directory URL, listed in order of preference.",

-                    "--weight=i" => "Postive numeric weight for device",
+                    "--weight=i" => "Positive numeric weight for device",

And so on...

Signed-off-by: Nick Andrew <[email protected]>

git-svn-id: http://code.sixapart.com/svn/mogilefs/trunk@1198 f67b2e87-0811-0410-a7e0-dd94e48410d6
  • Loading branch information
nickandrew committed Jul 10, 2008
1 parent f3595d6 commit 87a1ca6
Show file tree
Hide file tree
Showing 32 changed files with 64 additions and 62 deletions.
22 changes: 12 additions & 10 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
* Postgres locking routines did not include the hostname for the lock
* Many spelling errors corrected.

* PostGres locking routines did not include the hostname for the lock
release.

* RFC 2518 says we "should" use a trailing slash when calling
Expand All @@ -11,7 +13,7 @@

* Fix MultipleHosts replication policy to no longer return desperate
devices after no longer being desperate, instead returning a state
which will queue for retries in the future till it can be truely
which will queue for retries in the future till it can be truly
happy. This prevents files from being replicated to all writable
devs when there are two few writable hosts to satisfy the policy.

Expand Down Expand Up @@ -77,12 +79,12 @@

* Add a safety check to ensure that Postgresql-8.2 or newer is used.

* Update mogdbsetup usage, and ensure it choses the correct admin
* Update mogdbsetup usage, and ensure it chooses the correct admin
username automatically.

* Document the --type option to mogdbsetup.

* Introduce the Postgres Store implementation. The locking system might
* Introduce the PostGres Store implementation. The locking system might
still have issues, beware of stale locks! Initial prototype by Radu
Greab <[email protected]>, and developed heavily by Robin H. Johnson
<[email protected]>.
Expand All @@ -99,13 +101,13 @@
printf stuff works nicely.

* The unix_timestamp function belongs to the Store, not other classes.
Need to add testcases for process_deletes and stats.
Need to add test cases for process_deletes and stats.

* Using NULL during an INSERT for the AUTO_INCREMENT column does not
work very well outside of MySQL. Pass the correct number of arguments
to the INSERT instead.

* Clean up all raw usages of UNIX_TIMETAMP() function, in preparation
* Clean up all raw usages of UNIX_TIMESTAMP() function, in preparation
for database independence. If you need the unix timestamp, include the output
of $self->unix_timestamp directly into your query.

Expand Down Expand Up @@ -138,7 +140,7 @@
* Fix get_paths to honor new device state of 'drain' via new
DeviceStates interface.

* use signifigantly less CPU when re-broadcasting around
* use significantly less CPU when re-broadcasting around
iostat device utilization% to child processes. (future:
don't rebroadcast at all and use shared memory)

Expand Down Expand Up @@ -279,7 +281,7 @@
incomplete "Fsck" worker.

* test cleanup/robustness improvements. properly skips testing when
testin deps not found. but searches harder for them now, too.
testing deps not found. but searches harder for them now, too.
tests run under "make disttest".

* packaging cleanups, released using ShipIt.
Expand All @@ -300,7 +302,7 @@
* mogilefsd: memcache support for get_paths (see doc/memcache-support.txt)

2007-03-16:
* mogstored: make child processes be exec'ed (as as their own scripts, not inhertting
* mogstored: make child processes be exec'ed (as as their own scripts, not inheriting
Perlbal, Linux::AIO/IO::AIO, etc baggage). so they don't own listening
sockets, pipes to child workers, signal handlers, etc. just a lot
cleaner now, and SIGTERM, SIGINT properly shut everything down now,
Expand Down Expand Up @@ -354,7 +356,7 @@
* mogilefsd: major refactoring/cleanup/new features ("MogileFS 2.0")

2006-03-01 (Brad)
* mogilefsd: fix dataloss bug when the 'tempfile' table is Innodb and the
* mogilefsd: fix dataloss bug when the 'tempfile' table is InnoDB and the
server is restarted while the tempfile table is empty.

2006-02-28 (Jr)
Expand Down
2 changes: 1 addition & 1 deletion MogileFS-Server.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MogileFS-Server
summary: MoilgeFS-Server - MogileFS Server daemons and utilities.
summary: MogileFS-Server - MogileFS Server daemons and utilities.
version: 2.17
release: 1
vendor: Brad Fitzpatrick <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- if run out filedescriptors in mogilefsd, mogilefsd shouldn't crash. it might
-- if run out file descriptors in mogilefsd, mogilefsd shouldn't crash. it might
now. needs a test.

-- change debug level at runtime from mgmt port, propogate to children.
-- change debug level at runtime from mgmt port, propagate to children.

-- MogileFS::Device ->make_directory on lighttpd isn't exactly right, as WebDAV
spec says MKCOL on an existing directory should return 405 (Method Not Allowed),
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mogilefs-server (1.00-2) unstable; urgency=low

* fix dataloss bug when the 'tempfile' table is Innodb and the
* fix data loss bug when the 'tempfile' table is InnoDB and the
server is restarted while the tempfile table is empty.

-- Pavel Skaldin <[email protected]> Thu, 2 Mar 2006 17:12:51 -0800
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Depends: ${perl:Depends}, debhelper (>= 4.1.40), libdbd-mysql-perl, libdbi-perl,
Suggests: mogilefs-utils
Description: scalable distributed filesystem from Danga Interactive
MogileFS is an open-source, application-level distributed filesystem. It
creates a host-nuetral, filesystem-agnostic method of distributing files
creates a host-neutral, filesystem-agnostic method of distributing files
that has many advantages over NFS and single-machine raid. This set
of utilities is very scalable and can handle Livejournal.com's load, for
which it was designed.
2 changes: 1 addition & 1 deletion doc/fsck-notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ CREATE TABLE fsck (
# todo: replication policy saying "not quite happy" goes into "needs_replicate" table for to-be-fixed-later
# todo: stat command to get count of rows in needs_replicate (!repl replacement)

# provide command to drop fsck table to force global reindexing
# provide command to drop fsck table to force global re-indexing
# interface from fsck job to replicate job. or do it ourselves sharing code. (probably sharing code)
# perhaps command-line version is just running:
# mogilefsd --run-only-job=fsck --foreground --verbose
Expand Down
4 changes: 2 additions & 2 deletions doc/memcache-support.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load on the database.
After years of saying it's stupid, I finally implemented it, but I
still maintain it's (usually) stupid.

Reall, you should cache get_paths requests in your application,
Really, you should cache get_paths requests in your application,
avoiding an extra round-trip to the trackers that could be avoided on
a cache hit.

Expand All @@ -27,7 +27,7 @@ To use memcached support on get_paths requests, telnet to one of your trackers a

set_server_setting key=memcache_servers&value=127.0.0.1:11211

(where value is a comman-separated list, if you have multiple)
(where value is a comma-separated list, if you have multiple)

And then all future get_paths requests with noverify=1 (which now
doubles as the "memcached is okay" flag) will use memcache.
Expand Down
2 changes: 1 addition & 1 deletion doc/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ $ psql -Upostgres

Manual tests
============
If you only want to run some part of the testsuite, or you want detailed
If you only want to run some part of the test suite, or you want detailed
output as to why a test failed, you can run as follows:
$ MOGTEST_DBTYPE=<dbtype> perl -Ilib t/<foobar>.t
Where dbtype is one of MySQL (default), PostGres.
Expand Down
4 changes: 2 additions & 2 deletions lib/MogileFS/Config.pm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sub set_config {
shift if @_ == 3;
my ($k, $v) = @_;

# if a child, propogate to parent
# if a child, propagate to parent
if (my $worker = MogileFS::ProcManager->is_child) {
$worker->send_to_parent(":set_config_from_child $k $v");
} else {
Expand Down Expand Up @@ -131,7 +131,7 @@ sub load_config {
}

# Fill in defaults for those values which were either loaded from config or
# specified on the command line. Command line takes precendence, then values in
# specified on the command line. Command line takes precedence, then values in
# the config file, then the defaults.
$daemonize = choose_value( 'daemonize', 0 );
$db_dsn = choose_value( 'db_dsn', "DBI:mysql:mogilefs" );
Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/Device.pm
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ sub create_directory {
# if they don't support this method, remember that
if ($ans && $ans =~ m!HTTP/1\.[01] (400|405|501)!) {
$self->{no_mkcol} = 1;
# TODO: move this into method on device, which propogates to parent
# TODO: move this into method on device, which propagates to parent
# and also receive from parent. so all query workers share this knowledge
return 1;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/Domain.pm
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ sub reload_domains {
# FIXME: should probably have an invalidate_cache variant that only
# flushes locally (for things like "get_domains" or "get_hosts", where
# it needs to be locally correct for the semantics of the command, but
# no need to propogate a cache invalidation to our peers)
# no need to propagate a cache invalidation to our peers)
sub invalidate_cache {
$last_load = 0;
%id2name = ();
Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/FID.pm
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ sub rename {

# returns array of devids that this fid is on
# NOTE: TODO: by default, this doesn't cache. callers might be surprised from
# having an old version later on. before caching is added, auditting needs
# having an old version later on. before caching is added, auditing needs
# to be done.
sub devids {
my $self = shift;
Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/HTTPFile.pm
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ sub size {
my $self = shift;
my ($host, $port, $uri, $path) = map { $self->{$_} } qw(host port uri url);

# don't sigpipe us
# don't SIGPIPE us
my $flag_nosignal = MogileFS::Sys->flag_nosignal;
local $SIG{'PIPE'} = "IGNORE" unless $flag_nosignal;

Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/IOStatWatcher.pm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sub new {
Sets the list of hosts to connect to for collecting IOStat information. This call can block if you
pass it hostnames instead of ip addresses.
Upon successfull connection, the on_stats callback will be called each time the statistics are
Upon successful connection, the on_stats callback will be called each time the statistics are
collected. Error states (failed connections, etc.) will trigger retries on 60 second intervals, and
disconnects will trigger an immediate reconnect.
Expand Down
6 changes: 3 additions & 3 deletions lib/MogileFS/ProcManager.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use MogileFS::Connection::Client;
use MogileFS::Connection::Worker;

# This class handles keeping lists of workers and clients and
# assigning them to eachother when things happen. You don't actually
# assigning them to each other when things happen. You don't actually
# instantiate a procmanager. the class itself holds all state.

# Mappings: fd => [ clientref, jobstring, starttime ]
Expand Down Expand Up @@ -531,7 +531,7 @@ Mogilefsd admin commands:
!replication
(Deprecated/old)
See the replication status for unreplicated files.
See the replication status for un-replicated files.
Output format:
<domain> <class> <devcount> <files>
Expand Down Expand Up @@ -577,7 +577,7 @@ sub HandleChildRequest {

} elsif ($cmd =~ /^:repl_unreachable (\d+)/) {
# announce to the other replicators that this fid can't be reached, but note
# that we don't actually drain the queue to the requestor, as the replicator
# that we don't actually drain the queue to the requester, as the replicator
# isn't in a place where it can accept a queue drain right now.
MogileFS::ProcManager->ImmediateSendToChildrenByJob('replicate', "repl_unreachable $1", $child);

Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/ReplicationPolicy/MultipleHosts.pm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sub replicate_to {

# this is the per-class mindevcount (the old way), which is passed in automatically
# from the replication worker. but if we have our own configured mindevcount
# in class.replpolicy, like "MultipleHosts(3)", then we use the explciit one. otherwise,
# in class.replpolicy, like "MultipleHosts(3)", then we use the explicit one. otherwise,
# if blank, or zero, like "MultipleHosts()", then we use the builtin on
my $min = delete $args{min};
$min = $self->{mindevcount} || $min;
Expand Down
4 changes: 2 additions & 2 deletions lib/MogileFS/ReplicationPolicy/Union.pm
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ __END__
=head1 NAME
MogileFS::ReplicationPolicy::Union -- satisify 2 or more replication policies
MogileFS::ReplicationPolicy::Union -- satisfy 2 or more replication policies
=head1 RULES
Use this replication policy to satisify multiple replication policies.
Use this replication policy to satisfy multiple replication policies.
For instance:
Union(MultipleHosts(3), OnDevice(7))
Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/ReplicationRequest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ sub temp_fail {
}

# returns array of MogileFS::Device objs, in preferred order, one of
# which (but not multiple) would satisify the replication policy
# which (but not multiple) would satisfy the replication policy
# for its next step. at which point the replication policy needs
# to be asked again what the next step is.
sub copy_to_one_of_ideally {
Expand Down
8 changes: 4 additions & 4 deletions lib/MogileFS/Store.pm
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ sub insert_ignore {
if ($@ || $dbh->err) {
return 1 if $self->was_duplicate_error;
# This chunk is identical to condthrow, but we include it directly
# here as we know there is definetly an error, and we would like
# here as we know there is definitely an error, and we would like
# the caller of this function.
my ($pkg, $fn, $line) = caller;
my $msg = "Database error from $pkg/$fn/$line: " . $dbh->errstr;
Expand Down Expand Up @@ -595,7 +595,7 @@ sub TABLE_file_to_replicate {
# nexttry is time to try to replicate it next.
# 0 means immediate. it's only on one host.
# 1 means lower priority. it's on 2+ but isn't happy where it's at.
# unixtimestamp means at/after that time. some previous error occurred.
# unix timestamp means at/after that time. some previous error occurred.
# fromdevid, if not null, means which devid we should replicate from. perhaps it's the only non-corrupt one. otherwise, wherever.
# failcount. how many times we've failed, just for doing backoff of nexttry.
# flags. reserved for future use.
Expand Down Expand Up @@ -1002,7 +1002,7 @@ sub rename_file {
undef, $to_key, $fidid);
};
if ($@ || $dbh->err) {
# first is mysql's error code for duplicates
# first is MySQL's error code for duplicates
if ($self->was_duplicate_error) {
return 0;
} else {
Expand Down Expand Up @@ -1475,7 +1475,7 @@ sub random_fids_on_device {
my $dbh = $self->dbh;

# FIXME: this blows. not random. and good chances these will
# eventually get to point where they're un-rebalanacable, and we
# eventually get to point where they're un-rebalance-able, and we
# never move on past the first 5000
my @some_fids = List::Util::shuffle(@{
$dbh->selectcol_arrayref("SELECT fid FROM file_on WHERE devid=? LIMIT 5000",
Expand Down
4 changes: 2 additions & 2 deletions lib/MogileFS/Util.pm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ sub daemonize {
croak "Cannot detach from controlling terminal"
unless $sess_id = POSIX::setsid();

## Prevent possibility of acquiring a controling terminal
## Prevent possibility of acquiring a controlling terminal
$SIG{'HUP'} = 'IGNORE';
if ($pid = fork) { exit 0; }

Expand All @@ -139,7 +139,7 @@ sub daemonize {
close(STDOUT);
close(STDERR);

## Reopen stderr, stdout, stdin to /dev/null
## Reopen STDERR, STDOUT, STDIN to /dev/null
if ( $MogileFS::DEBUG ) {
open(STDIN, "+>/tmp/mogilefsd.log");
} else {
Expand Down
2 changes: 1 addition & 1 deletion lib/MogileFS/Worker.pm
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ sub invalidate_meta {
}

# tries to parse generic (not job-specific) commands sent from parent
# to child. returns 1 on success, or 0 if comman given isn't generic,
# to child. returns 1 on success, or 0 if command given isn't generic,
# and child should parse.
# lineref doesn't have \r\n at end.
sub process_generic_command {
Expand Down
4 changes: 2 additions & 2 deletions lib/MogileFS/Worker/Delete.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use base 'MogileFS::Worker';
use MogileFS::Util qw(error);

# we select 1000 but only do a random 100 of them, to allow
# for stateless paralleism
# for stateless parallelism
use constant LIMIT => 1000;
use constant PER_BATCH => 100;

Expand Down Expand Up @@ -77,7 +77,7 @@ sub process_tempfiles {

# BUT NOTE:
# the fids might exist on one of the devices in devids column if we assigned them those,
# they wrote some to one of them, then they died or for wahtever reason didn't create_close
# they wrote some to one of them, then they died or for whatever reason didn't create_close
# to use, so we shouldn't delete from tempfile before going on a hunt of the missing fid.
# perhaps we should just add to the file_on table for both devids, and let the regular delete
# process discover via 404 that they're not there.
Expand Down
Loading

0 comments on commit 87a1ca6

Please sign in to comment.