Fix up the rados_fsid function

The rados_fsid function was failing due to the
UUID parsing failing. Ceph actually returns a
UUID hyphenated string instead of just a simple
UUID string like I had originally thought.

Author: cholcombe973

examples/ceph.rs

@@ -40,7 +40,7 @@ fn main() {
     // return and allow for pattern matching.
 
     // Example of accessing the `Admin Socket` for mon
-    match admin_socket_command("help", "/var/run/ceph/ceph-mon.ceph-vm1.asok") {
+    match admin_socket_command("help", "/var/run/ceph/ceph-mon.ip-172-31-31-247.asok") {
         Ok(json) => {
             println!("{}", json);
         },
@@ -51,16 +51,24 @@ fn main() {
 
     let rados_version = ceph_helpers::rados_libversion();
     println!("Librados version: {:?}", rados_version);
+
+    println!("Connecting to ceph");
     let cluster = ceph_helpers::connect_to_ceph("admin", "/etc/ceph/ceph.conf").unwrap();
+    println!("Creating pool {}", pool_name);
     ceph_helpers::rados_create_pool(cluster, pool_name).unwrap();
 
+    println!("Listing pools");
     let pools_list = ceph_helpers::rados_pools(cluster).unwrap();
-    println!("{:?}", pools_list);
+	for pool in pools_list{
+		println!("pool: {}", pool);
+	}
 
+    println!("Deleting pool: {}", pool_name);
     ceph_helpers::rados_delete_pool(cluster, pool_name).unwrap();
 
-    let fsid = ceph_helpers::rados_fsid(cluster).unwrap();
-    println!("rados_cluster_fsid {}", fsid);
+    println!("Getting cluster fsid");
+    let fsid = ceph_helpers::rados_fsid(cluster);
+    println!("rados_cluster_fsid {:?}", fsid);
 
     let cluster_stat = ceph_helpers::rados_stat_cluster(cluster).unwrap();
     println!("Cluster stat: {:?}", cluster_stat);
@@ -74,7 +82,7 @@ fn main() {
     // and `git_version`
     // will be called soon to replace the string parse.
     // Change to the real mon admin socket name
-    let ceph_ver = ceph_helpers::ceph_version("/var/run/ceph/ceph-mon.ceph-vm1.asok");
+    let ceph_ver = ceph_helpers::ceph_version("/var/run/ceph/ceph-mon.ip-172-31-31-247.asok");
     println!("Ceph Version - {:?}", ceph_ver);
     // Mon command to check the health. Same as `ceph -s`
     match ceph_helpers::ceph_mon_command(cluster, "prefix", "status", None) {
@@ -102,6 +110,7 @@ fn main() {
     // It's very long so it's commented out.
     // println!("{}", ceph_helpers::ceph_commands(cluster, None).unwrap().pretty());
     unsafe {
+		println!("Getting rados instance id");
         let instance_id = ceph::rados_get_instance_id(cluster);
         println!("Instance ID: {}", instance_id);
     }

src/ceph.rs

@@ -14,16 +14,14 @@
 #![cfg(target_os = "linux")]
 #![allow(unused_imports)]
 
-use std::error::Error as StdError;
-use std::ffi::{CStr, CString, IntoStringError, NulError};
+use std::ffi::{CStr, CString};
 
-use std::io::{BufRead, Cursor, Error};
+use std::io::{BufRead, Cursor};
 use std::net::IpAddr;
-use std::iter::FromIterator;
-use std::{ptr, fmt, slice, str};
+use std::{ptr, str};
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use uuid::{ParseError, Uuid};
+use uuid::{Uuid};
 use byteorder::{LittleEndian, WriteBytesExt};
 use nom::{IResult, le_u32};
 use libc::*;
@@ -1557,22 +1555,18 @@ pub fn rados_fsid(cluster: rados_t) -> Result<Uuid, RadosError> {
         return Err(RadosError::new("Rados not connected.  Please initialize cluster".to_string()));
     }
     let mut fsid_buffer: Vec<u8> = Vec::with_capacity(37);
-    let fsid: Uuid;
     unsafe {
         let ret_code = rados_cluster_fsid(cluster, fsid_buffer.as_mut_ptr() as *mut c_char, fsid_buffer.capacity());
         if ret_code < 0 {
             return Err(RadosError::new(try!(get_error(ret_code))));
         }
-        if ret_code > 0 {
-            // Length of buffer required for fsid
-            fsid_buffer.reserve(ret_code as usize);
-            rados_cluster_fsid(cluster, fsid_buffer.as_mut_ptr() as *mut c_char, fsid_buffer.capacity());
-            // Tell the Vec how much Ceph read into the buffer
-            fsid_buffer.set_len(ret_code as usize);
-        }
+        // Tell the Vec how much Ceph read into the buffer
+        fsid_buffer.set_len(ret_code as usize);
     }
-    fsid = try!(Uuid::from_bytes(&fsid_buffer));
-    Ok(fsid)
+    //Ceph actually returns the fsid as a uuid string
+    let fsid_str = String::from_utf8(fsid_buffer)?;
+    // Parse into a UUID and return
+    Ok(fsid_str.parse()?)
 }
 
 /// Ping a monitor to assess liveness