Author: mpatelcz Date: Tue Nov 3 14:52:09 2009 New Revision: 59277 URL: http://svn.opensuse.org/viewcvs/yast?rev=59277&view=rev Log: Code clean up. Removed lot of y2mil. Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPart.cc branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc?rev=59277&r1=59276&r2=59277&view=diff ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc Tue Nov 3 14:52:09 2009 @@ -98,7 +98,6 @@ if( canHandleDev(mdDev,line2) ) { - y2mil( "Creating new Md object"); Md* m = new Md( *this, line, line2 ); addMd( m ); getline(file,line); @@ -801,7 +800,6 @@ bool MdCo::canHandleDev(const string& name, const string& line2) { - y2mil("Called for : " << name); unsigned dummy; //If this is a valid MD name. if( Md::mdStringNum(name,dummy) ) @@ -813,7 +811,6 @@ if( line2.find("external:imsm") == string::npos && line2.find("external:ddf") == string::npos ) { - //Ok. y2mil("Device : " << name << " can be handled by Md."); return true; } Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPart.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPart.cc?rev=59277&r1=59276&r2=59277&view=diff ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPart.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPart.cc Tue Nov 3 14:52:09 2009 @@ -47,8 +47,10 @@ num = nr; p = pa; if( pa ) + { setSize( pa->sizeK() ); - y2mil("constructed MdPart " << dev << " on co " << cont->name()); + } + y2mil("constructed MdPart " << dev << " on MdPartCo : " << cont->name()); } MdPart::MdPart(const MdPartCo& d, const MdPart& rhs) @@ -70,9 +72,13 @@ dev = "/dev/" + name; string::size_type pos = name.find_last_of( "/" ); if( pos!=string::npos ) + { nm = name.substr( pos+1 ); + } else + { nm = name; + } } const MdPartCo* MdPart::co() const @@ -99,9 +105,6 @@ { mnr = mi; mjr = mj; - // Don't need this for MD - //replaceAltName( "/dev/dm-", "/dev/dm-"+decString(mnr) ); - //getTableInfo(); } } @@ -132,7 +135,7 @@ { addAltUdevId( num ); } -//TODO: Is it OK? Check it later +//TODO: Is it OK? Check it static string udevCompleteIdPath( const string& s, unsigned nr ) { return( "/dev/disk/by-id/" + s + "-part" + decString(nr) ); @@ -246,6 +249,13 @@ void MdPart::getPartitionInfo(storage::PartitionInfo& pinfo) { + ((Volume*)this)->getInfo( pinfo.v ); + if( p ) + { + PartitionAddInfo info; + p->getInfo( info ); + pinfo = info; + } } Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc?rev=59277&r1=59276&r2=59277&view=diff ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc Tue Nov 3 14:52:09 2009 @@ -54,7 +54,7 @@ ProcPart* ppart ) : Container(s,"",staticType()) // MD? { - y2mil("constructing MdPart co " << name); + y2mil("constructing MdPartCo : " << name); makeDevName(name); nm = undevName(name); @@ -63,12 +63,9 @@ active = del_ptable = false; disk = NULL; - y2mil("MdPartCo::nm=" << nm <<", dev=" << dev); /* First Initialize RAID properties. */ - y2mil("Initializing MD "); initMd(); - /* */ - y2mil("Initializing Partitions"); + /* Initialize 'disk' part, partitions.*/ init( ppart ); is_copy = false; @@ -77,6 +74,9 @@ handlingMd = true; } devHandled.push_back(name); + + y2mil("MdPartCo (nm=" << nm << ", dev=" << dev << ", level=" << md_type << ", disks=" << devs << ") ready."); + } MdPartCo::~MdPartCo() @@ -86,7 +86,7 @@ delete disk; disk = NULL; } - y2deb("destructed MdPart co " << dev); + y2deb("destructed MdPartCo : " << dev); if( is_copy == false ) { @@ -135,8 +135,6 @@ MdPartCo::addNewDev(string& device) { int ret = 0; - y2mil("device:" << device << " dev:" << dev); - /* mdXYZpX*/ if ( isMdPart(device) == false ) { ret = MD_PARTITION_NOT_FOUND; @@ -146,7 +144,6 @@ unsigned number; const string tmpS(device); getPartNum(tmpS,number); - y2mil("num:" << number); device = "/dev/" + numToName(number); Partition *p = getPartition( number, false ); if( p==NULL ) @@ -155,16 +152,20 @@ } else { - y2mil("*p:" << *p); MdPart * md = NULL; newP( md, p->nr(), p ); md->getFsInfo( p ); md->setCreated(); addToList( md ); + y2mil("device:" << device << " was added to MdPartCo : " << dev); + } handleWholeDevice(); } - y2mil("device:" << device << " ret:" << ret); + if( ret != 0 ) + { + y2war("device:" << device << " was not added to MdPartCo : " << dev); + } return ret; } @@ -364,16 +365,11 @@ MdPartCo::init( ProcPart* ppart ) { const string tmpS(nm); - //Something is wrong- if( ppart ) { ppart->getSize( nm, size_k ); - //getPartNum(tmpS,tmp); } - //getPartNum(nm,mnr); - //mnr = tmp; - //y2mil( "mnr:" << mnr << " nm:" << nm << " size_k:" << size_k); - y2mil( " nm:" << nm << " size_k:" << size_k); + y2mil( " nm: " << nm << " size_k: " << size_k); createDisk( ppart ); getVolumes( ppart ); active = true; @@ -382,16 +378,12 @@ void MdPartCo::createDisk( ProcPart* ppart ) { - y2mil("Create disk for " << nm); if( disk ) delete disk; disk = new Disk( getStorage(), dev, size_k ); - //FIXME: Minor is the 'md' minor? disk->setNumMinor( 64 ); disk->setSilent(); disk->setSlave(); - //FIXME: what does it do? - y2mil("Detecting disks Partitions"); if( ppart ) { disk->detect( *ppart ); @@ -402,7 +394,6 @@ void MdPartCo::newP( MdPart*& dm, unsigned num, Partition* p ) { - y2mil( "Called for partition num:" << num ); dm = new MdPart( *this, num, p ); } @@ -410,16 +401,13 @@ void MdPartCo::getVolumes( ProcPart* ppart ) { - y2mil("GetVolumes called for " << nm); vols.clear(); num_part = 0; Disk::PartPair pp = disk->partPair(); Disk::PartIter i = pp.begin(); MdPart * p = NULL; - y2mil("Enumerating Partitions on " << nm); while( i!=pp.end() ) { - y2mil("Partitions number" << i->nr()); newP( p, i->nr(), &(*i) ); if( ppart ) p->updateSize( *ppart ); @@ -524,7 +512,6 @@ ret += "p"; ret += decString(num); } - y2mil( "num:" << num << " ret:" << ret ); return( ret ); } @@ -1304,11 +1291,9 @@ list<string> MdPartCo::getMdRaids() { - list<string> l; - - y2mil( "begin" ); + y2mil( " called " ); + list<string> l; string line; - string dev_name; std::ifstream file( "/proc/mdstat" ); classic(file); @@ -1324,7 +1309,6 @@ line2.find("external:imsm") == string::npos) { // external:imsm or ddf not found. Assume that this is a Volume. - y2mil( "Found MD: " << dev_name ); l.push_back(dev_name); } } @@ -1333,7 +1317,7 @@ file.close(); file.clear(); - y2mil("detected mdparts " << l); + y2mil("detected md devs : " << l); return l; } @@ -1373,7 +1357,6 @@ void MdPartCo::getMdMajor() { md_major = getMajorDevices( "md" ); - y2mil("md_major:" << md_major); } void MdPartCo::setSize(unsigned long long size ) @@ -1394,14 +1377,13 @@ if( !readProp(METADATA, md_metadata) ) { - y2mil("Failed to read metadata"); + y2war("Failed to read metadata"); } - y2mil("sb_ver " << md_metadata); property.clear(); if( !readProp(COMPONENT_SIZE, property) ) { - y2mil("Failed to read component_size"); + y2war("Failed to read component_size"); setSize(0); } else @@ -1409,13 +1391,12 @@ unsigned long long tmpSize; property >> tmpSize; setSize(tmpSize); - y2mil("component size :" << tmpSize); } property.clear(); if( !readProp(CHUNK_SIZE, property) ) { - y2mil("Failed to read chunk_size"); + y2war("Failed to read chunk_size"); chunk_size = 0; } else @@ -1423,56 +1404,46 @@ property >> chunk_size; /* From 'B' in file to 'Kb' here. */ chunk_size /= 1024; - y2mil("chunk size :" << chunk_size); } property.clear(); if( !readProp(ARRAY_STATE, property) ) { md_state = storage::UNKNOWN; - y2mil("array state unknown "); + y2war("array state unknown "); } else { if( property == "readonly" ) { //setReadonly(); - y2mil("Read only volume! "); } md_state = toMdArrayState(property); - y2mil("Array state : " << property << "(" << md_state << ")"); - } if( !readProp(LEVEL, property) ) { - y2mil("RAID type unknown"); + y2war("RAID type unknown"); md_type = storage::RAID_UNK; } else { md_type = toMdType(property); - y2mil("RAID type '" << property << "'(" << md_type << ")"); } // setMdParity(); - y2mil("Getting Devs"); - setMdDevs(); - y2mil("Getting spares"); - setSpares(); - y2mil("reading 'map' file."); - readMdMap(); - setMetaData(); - y2mil("Done"); + setMdDevs(); + setSpares(); + readMdMap(); + setMetaData(); + y2mil("Done"); } bool MdPartCo::readProp(enum MdProperty prop, string& val) { string path = sysfs_path + nm + "/md/" + md_props[prop]; - y2mil("Path : " << path); - if( access( path.c_str(), R_OK )==0 ) { std::ifstream file( path.c_str() ); @@ -1483,10 +1454,9 @@ } else { - y2mil("File: " << sysfs_path << md_props[prop] << " = FAILED"); + y2war("File: " << sysfs_path << md_props[prop] << " = FAILED"); return false; } - y2mil("File: " << sysfs_path << md_props[prop] << " = " << val); return true; } @@ -1499,8 +1469,6 @@ devs_list.clear(); - y2mil("called, path=" << path); - if ((dir = opendir(path.c_str())) != NULL) { struct dirent* entry; @@ -1509,11 +1477,10 @@ string tmpS(entry->d_name); y2mil("Entry : " << tmpS); if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) + { continue; - - y2mil("Adding disk : " << tmpS); + } devs_list.push_back( ("/dev/"+tmpS) ); - } closedir(dir); } @@ -1531,7 +1498,6 @@ for( list<string>::iterator s=devs.begin(); s!=devs.end(); ++s ) { //It will be set always to last RAID that was detected. - y2mil("Setting device : " << *s << " as used by UB_MDPART " << nm); getStorage()->setUsedBy( *s, UB_MDPART, nm ); } } @@ -1608,10 +1574,8 @@ if( pos != string::npos ) { sb_ver = val.erase(0,pos+1); - y2mil("sb_ver: " << sb_ver); } } - return; } @@ -1679,7 +1643,6 @@ for( list<string>::iterator s=spare.begin(); s!=spare.end(); ++s ) { //It will be set always to last RAID that was detected. - y2mil("Setting device : " << *s << " as used by UB_MDPART " << nm); getStorage()->setUsedBy( *s, UB_MDPART, nm ); } } @@ -1694,11 +1657,9 @@ int i=0; while( mdadm_map[i] ) { - y2mil("Looking for file: " << mdadm_map[i]); file.open( mdadm_map[i] ); if( file.is_open() ) { - y2mil("Found"); return true; } else @@ -1706,7 +1667,7 @@ i++; } } - y2mil("File not found"); + y2war(" Map File not found"); return false; } @@ -1719,36 +1680,24 @@ string line; classic(file); - y2mil("Reading 'map' file"); /* Got file, now parse output. */ if( findMdMap(file) ) { - y2mil("map file found."); while( !file.eof() ) { string val; getline(file,line); - y2mil("Line: " << line); val = extractNthWord( MAP_DEV, line ); if( val == nm ) { size_t found; - y2mil("Found good line, paring"); md_uuid = extractNthWord( MAP_UUID, line ); - y2mil("UUID: " << md_uuid); - val = extractNthWord( MAP_NAME, line ); found = val.find_last_of("/"); md_name = val.substr(found+1); - - y2mil("md name is: " << md_name); file.close(); return true; } - else - { - y2mil("getting another line."); - } } file.close(); } @@ -1760,10 +1709,7 @@ void MdPartCo::initMd(void) { /* Name is 'nm' read all props. */ - y2mil("Called for device : " << nm); getMdProps(); - - y2mil("Exiting"); } @@ -1863,7 +1809,6 @@ { string path = sysfs_path + nm + "/dev"; - y2mil("Accessing file: " << path); if( access( path.c_str(), R_OK )==0 ) { string val; @@ -1877,8 +1822,6 @@ val.substr(0,pos) >> mjr; val.substr(pos+1) >> mnr; - y2mil("Major:"<http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc?rev=59277&r1=59276&r2=59277&view=diff ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc Tue Nov 3 14:52:09 2009 @@ -221,11 +221,8 @@ delete ppart; ppart = new ProcPart; } - /* Grab Partitionable MD Devices and put them on the exception list.*/ - y2mil("Starting MD part"); detectMdParts(*ppart); detectMds(); - y2mil("MD Part done."); detectDmraid( *ppart ); detectDmmultipath( *ppart ); @@ -404,7 +401,6 @@ list<string> mdpList; for( list<string>::const_iterator i=inList.begin(); i!=inList.end(); ++i ) { - y2mil(" Element: " << *i); if( instsys() ) { // 1. With Partition Table @@ -424,6 +420,7 @@ } } } + y2mil("List of partitionable devs: " << mdpList); return mdpList; } @@ -443,29 +440,21 @@ string file = testdir()+"/md"; if( access( file.c_str(), R_OK )==0 ) { - //FIXME - //addToList( new MdPartCo( this, file ) ); y2mil("MD PART CO in test mode not available yet"); } } else { const list<string> l = MdPartCo::getMdRaids(); - //map by_id; - //getUdevMap("/dev/disk/by-id", by_id); const list<string> mdpartlist = dispatchMdDevs(l); // for( list<string>::const_iterator i = mdpartlist.begin(); i != mdpartlist.end(); i++) { - y2mil(" Md Part Co :" << *i); MdPartCo * v = new MdPartCo( this, *i, &ppart ); - //list<string> nm = by_id["dm-"+decString(v->minorNr())]; - // if( !nm.empty() ) - // v->setUdevData( nm ); - y2mil("Container is valid. Adding."); - addToList( v ); + // check for valid? + addToList( v ); } } y2mil("Done"); @@ -506,8 +495,7 @@ bool ret = MdPartCo::isMdPlatform(); if( ret == true ) { - y2mil(" This is a Intel SW RAID Platform"); - y2mil(" Activating Md subsystem."); + y2mil("Intel SW RAID Platform detected."); MdPartCo::activate( true, tmpDir() ); waitForDevice(); @@ -577,24 +565,18 @@ "Do you want MD Partitionable subsystem to manage those partitions?" ), mdDevs.c_str(),s1.c_str(),s2.c_str() ); - y2mil(" Asking user:"); - y2mil("" + txt); if( yesnoPopupCb(txt) ) { - y2mil(" YES - In this mode MD PART is handling MD Devices"); ret = true; MdPartCo::setHandlingDev(true); } else { - y2mil(" NO - not handling MD Devices"); MdPartCo::setHandlingDev(false); //User said 'No' - switch off MD. MdPartCo::activate( false, "" ); ret = false; } - // "Intel disk %1$s is not readable by\n" - //FIXME: If answer is yes then set flag in storage->imsmByMd(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org