Author: mpatelcz Date: Wed Sep 23 18:36:19 2009 New Revision: 58727 URL: http://svn.opensuse.org/viewcvs/yast?rev=58727&view=rev Log: Moved md initialization ahead of disks initialization. Modified: branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.cc branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.h branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.cc branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.h branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Storage.cc Modified: branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.cc?rev=58727&r1=58726&r2=58727&view=diff ============================================================================== --- branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.cc (original) +++ branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.cc Wed Sep 23 18:36:19 2009 @@ -860,27 +860,55 @@ } +/* For now it only understand 'external:' */ +void +Md::getParent(string& par) +{ + string ret; + string con = sb_ver; + string::size_type pos1; + string::size_type pos2; + if( con.find("external:")==0 ) + { + if( (pos1=con.find_first_of("/")) != string::npos ) + { + if( (pos2=con.find_last_of("/")) != string::npos) + { + if( pos1 != pos2) + { + par.clear(); + par = con.substr(pos1+1,pos2-pos1-1); + } + } + } + else + { + // Container + par.clear(); + } + } +} bool Md::readProp(enum MdProperty prop, string& val) { string path = sysfs_path + nm + "/md/" + md_props[prop]; y2mil("Path : " << path); - std::ifstream file( path.c_str() ); - classic(file); - if( file.good() ) + if( access( path.c_str(), R_OK )==0 ) { - getline(file,val); + std::ifstream file( path.c_str() ); + classic(file); + file >> val; + file.close(); + file.clear(); } else { y2mil("File: " << sysfs_path << md_props[prop] << " = FAILED"); return false; } - file.close(); - file.clear(); y2mil("File: " << sysfs_path << md_props[prop] << " = " << val); return true; } @@ -903,10 +931,10 @@ y2mil("Entry : " << tmpS); if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) continue; + y2mil("Adding disk : " << tmpS); devs.push_back( ("/dev/"+tmpS) ); - /* Get disk and mark it as used by MD. */ } closedir(dir); } Modified: branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.h?rev=58727&r1=58726&r2=58727&view=diff ============================================================================== --- branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.h (original) +++ branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Md.h Wed Sep 23 18:36:19 2009 @@ -29,6 +29,9 @@ void setArrayState( storage::MdArrayState val ) { md_state = val; } /* */ + /* If this is volume it will return parent container. */ + void getParent(string& par); + unsigned long chunkSize() const { return chunk; } void setChunkSize( unsigned long val ) { chunk=val; } void setMdUuid( const string&val ) { md_uuid=val; } Modified: branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.cc?rev=58727&r1=58726&r2=58727&view=diff ============================================================================== --- branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.cc (original) +++ branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.cc Wed Sep 23 18:36:19 2009 @@ -81,10 +81,22 @@ } } + +/* Call after parsing '/proc/mdstat'. + * It will connect any md volume with proper container. + * Each volume will be set as 'used by' + */ +void +MdCo::ConnectMdDevs() +{ + // +} + + void MdCo::getMdData() { - y2milestone( "begin" ); + y2milestone( "Gathering data begins..." ); string line; string dev_name; std::ifstream file( "/proc/mdstat" ); @@ -110,6 +122,7 @@ } file.close(); file.clear(); + /* */ file.open( (getStorage()->root()+"/etc/raidtab").c_str() ); MdIter i; getline( file, line ); @@ -147,15 +160,31 @@ } getline( file, line ); } + + /* Used by! Activate here disks? */ + /* TBD: Disk is used by container and volume: We choose container. */ MdPair p=mdPair(Md::notDeleted); for( MdIter i=p.begin(); i!=p.end(); ++i ) - { - string num = "md"+decString(i->nr()); - list<string> devs; - i->getDevs( devs ); - for( list<string>::iterator s=devs.begin(); s!=devs.end(); ++s ) - getStorage()->setUsedBy( *s, UB_MD, num ); - } + { + if( i->personality() == storage::CONTAINER ) + { + y2mil("MD device is a container."); + string num = "md"+decString(i->nr()); + list<string> devs; + i->getDevs( devs ); + y2mil("MdDev : " << num << " with devs : " << devs); + for( list<string>::iterator s=devs.begin(); s!=devs.end(); ++s ) + { + y2mil("Setting device : " << *s << " as used by UB_MD " << num); + getStorage()->setUsedBy( *s, UB_MD, num ); + } + } + else + { + y2mil("MD device is not a container. It will be used by other MD"); + /* Get Parent container and mark as used by. */ + } + } } void @@ -182,11 +211,46 @@ } } +/* FIXME: md not volume in list.. :( */ +void +MdCo::connectMd(Md* m) +{ + list::iterator i = vols.begin(); + while( i != vols.end() ) + { + /* */ + Md* tmpMd = dynamic_cast(*i); + if( tmpMd == 0 ) + { + i++; + continue; + } + switch (m->personality()) + { + case storage::CONTAINER: + break; + case storage::RAID_UNK: + /* Error */ + break; + default: + /* All RAID types 0,1,5,10,6,...*/ + break; + } + + } +} + void -MdCo::addMd( Md* m ) +MdCo::addMd( Md* m, bool connect) { if( !findMd( m->nr() )) + { + if( connect ) + { + connectMd(m); + } addToList( m ); + } else { y2warning( "addMd alread exists %u", m->nr() ); Modified: branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.h?rev=58727&r1=58726&r2=58727&view=diff ============================================================================== --- branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.h (original) +++ branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/MdCo.h Wed Sep 23 18:36:19 2009 @@ -99,7 +99,14 @@ bool findMd( const string& dev, MdIter& i ); bool findMd( const string& dev ); int checkUse( const string& dev ); - void addMd( Md* m ); + /* Each time this is called it searches for: + * 1. Duplicate + * 2. If m is container: for it's child volumes. + * 3. if m is volume: for it's raid container parent. + */ + void addMd( Md* m , bool connect=false); + void connectMd(Md* m); + void checkMd( Md* m ); void updateEntry( const Md* m ); void initTab(); Modified: branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Storage.cc?rev=58727&r1=58726&r2=58727&view=diff ============================================================================== --- branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Storage.cc (original) +++ branches/tmp/mpatelcz/SLE-11-SP1-Stash/libstorage/src/Storage.cc Wed Sep 23 18:36:19 2009 @@ -203,20 +203,40 @@ void Storage::detectObjects() { + y2mil("detect objects called"); ProcPart* ppart = new ProcPart; + + + /* Detect disks shall not be first. + * 1. Detect any RAID subsystem: + * 2. If raid is active: it will get some disks. + * 2.1 it will expose RAID Volume as disk possibly + * 2.2 Raid must activate disks that it uses and mark them + * as used by RAID. + * 3. After that other disks can be initialized. + */ + y2mil("Detecting MD RAID"); + if( instsys() ) + { + y2mil("Actiating MD RAID."); + MdCo::activate( true, tmpDir() ); + waitForDevice(); + } + detectMds(); + y2mil("Detecting disks"); detectDisks( *ppart ); + if( instsys() ) { DmraidCo::activate( true ); waitForDevice(); - MdCo::activate( true, tmpDir() ); - waitForDevice(); + LvmVg::activate( true ); waitForDevice(); delete ppart; ppart = new ProcPart; } - detectMds(); + detectDmraid( *ppart ); detectDmmultipath( *ppart ); detectLvmVgs(); @@ -368,6 +388,7 @@ void Storage::detectDisks( ProcPart& ppart ) { + y2mil("Detect Disks called with partitions."); if( test() ) { glob_t globbuf; @@ -382,6 +403,7 @@ } else if( autodetect ) { + y2mil("Audodetect disks active."); autodetectDisks( ppart ); } } @@ -389,6 +411,7 @@ void Storage::detectMds() { + y2mil("Detect MD called, will detect any MD RAID devices."); if( test() ) { string file = testdir+"/md"; @@ -399,12 +422,20 @@ } else { + y2mil("Creating MD Container object."); MdCo * v = new MdCo( this, true ); if( !v->isEmpty() ) + { + y2mil("Container is not empty. Adding to list."); addToList( v ); + } else + { + y2mil("MD Container empty."); delete v; + } } + y2mil("Detect MD fihised."); } void Storage::detectLoops( ProcPart& ppart ) @@ -625,8 +656,9 @@ void Storage::initDisk( DiskData& data, ProcPart& pp ) { - y2mil( "data:" << data ); + y2mil( "Init Disk, data:" << data ); data.dev = data.name; + y2mil( "name" << data.name ); string::size_type pos = data.dev.find('!'); while( pos!=string::npos ) { @@ -674,6 +706,7 @@ void Storage::autodetectDisks( ProcPart& ppart ) { + y2mil("Auto detect disks entered."); DIR *Dir; struct dirent *Entry; if( (Dir=opendir(SYSFSDIR))!=NULL ) @@ -710,6 +743,7 @@ { DiskData::DTyp t = (dn.find( "dasd" )==0)?DiskData::DASD :DiskData::DISK; + y2mil("Adding disk: " << dn << "type="<0 ) @@ -718,6 +752,7 @@ string devname; int ret; char lbuf[1024+1]; + y2mil("Accessing : " << SysfsFile ); if( access( SysfsFile.c_str(), R_OK )==0 && (ret=readlink( SysfsFile.c_str(), lbuf, sizeof(lbuf) ))>0 ) { @@ -730,9 +765,15 @@ dl.push_back( DiskData( dn, DiskData::XEN, Size/2 ) ); } } + else + { + y2mil(" Device : " << SysfsDir << " Skipped !!!"); + } } + y2mil("Enumeration of sysfs dir ended."); closedir( Dir ); y2mil( "dl: " << dl ); + y2mil("Initializing disks."); for( list<DiskData>::iterator i = dl.begin(); i!=dl.end(); ++i ) { initDisk( *i, ppart ); @@ -746,6 +787,7 @@ if (!by_path[i->dev].empty()) tmp = by_path[i->dev].front(); i->d->setUdevData(tmp, by_id[i->dev]); + y2mil("Adding disk to list: " << i->d->dev); addToList( i->d ); } } @@ -754,6 +796,7 @@ { y2err("Failed to open:" SYSFSDIR); } + y2mil("autodetect disks finished."); } void @@ -4853,23 +4896,27 @@ VolIterator v; if( !findVolume( dev, v ) ) { + y2mil("Volume not found."); DiskIterator i = findDisk( dev ); if( i != dEnd() ) { + y2mil("Found disk and setting used by."); i->setUsedBy(ub_type, ub_name); } else { ret = false; - y2err("could not set ub_type:" << ub_type << " ub_name:" << ub_name << - "for dev: " << dev); + y2err("could not set ub_type: " << ub_type << ", ub_name: " << + ub_name << " for dev: " << dev); } } else { + y2mil("Found volume and setting used by."); v->setUsedBy(ub_type, ub_name); } - y2mil("dev:" << dev << " ub_type:" << ub_type << " ub_name:" << ub_name << " ret:" << ret); + y2mil("dev:" << dev << " ub_type: " << ub_type << ", ub_name: " << + ub_name << " ret: " << ret); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org