Changeset 370

Show
Ignore:
Timestamp:
08/23/06 23:22:48 (2 years ago)
Author:
bradfitz
Message:

allow starting server w/ unexpected schema version

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/server-newrepl/lib/MogileFS/Config.pm

    r358 r370  
    6666                             'default_mindevcount=i' => \$cmdline{default_mindevcount}, 
    6767                             'node_timeout=i' => \$cmdline{node_timeout}, 
     68                             'no_schema_check' => \$cmdline{no_schema_check}, 
    6869                             ); 
    6970 
    …… 
    126127    $node_timeout   = choose_value( 'node_timeout', 2 ); 
    127128 
     129    choose_value( 'no_schema_check', 0 ); 
     130 
    128131    # now load plugins 
    129132    load_plugins($cfgfile{plugins}) if $cfgfile{plugins}; 
    …… 
    132135} 
    133136 
    134 ### FUNCTION: choose_value( $name, $default[, $boolean] ) 
    135 sub choose_value ($$;$) { 
    136     my ( $name, $default, $boolean ) = @_; 
     137### FUNCTION: choose_value( $name, $default ) 
     138sub choose_value { 
     139    my ( $name, $default ) = @_; 
    137140    return set_config($name, $cmdline{$name}) if defined $cmdline{$name}; 
    138141    return set_config($name, $cfgfile{$name}) if defined $cfgfile{$name}; 

  • branches/server-newrepl/mogilefsd

    r358 r370  
    927927 
    928928    my $sversion = get_server_setting('schema_version') || 0; 
    929     unless ($sversion == SCHEMA_VERSION) { 
     929    unless ($sversion == SCHEMA_VERSION || MogileFS::Config->config('no_schema_check')) { 
    930930        my $exp = SCHEMA_VERSION; 
    931931        die "Server's database schema version of $sversion doesn't match expected value of $exp.  Halting.\n\n".