Merge remote branch 'origin/stable'

Conflicts:
	src/osdc/Journaler.cc

configure.ac

@@ -7,7 +7,7 @@ AC_PREREQ(2.59)
 # NOTE: This version is _only_ used for naming the tarball.  The
 # VERSION define is not used by the code.  It gets a version string
 # from 'git describe'; see src/ceph_ver.[ch]
-AC_INIT([ceph], [0.26rc], [[email protected]])
+AC_INIT([ceph], [0.26], [[email protected]])
 
 AC_CONFIG_SUBDIRS([src/gtest])
 
@@ -163,9 +163,9 @@ AM_CONDITIONAL(WITH_FUSE, [test "$HAVE_LIBFUSE" = "1"])
 
 # tcmalloc?
 AC_ARG_WITH([tcmalloc],
-	    [AS_HELP_STRING([--without-tcmalloc], [disable tcmalloc for memory allocations])],
+	    [AS_HELP_STRING([--with--tcmalloc], [use tcmalloc instead of ptmallc])],
 	    [],
-	    [with_tcmalloc=yes])
+	    [with_tcmalloc=check])
 TCMALLOC=
 AS_IF([test "x$with_tcmalloc" != xno],
 	    [AC_CHECK_LIB([tcmalloc], [malloc],
@@ -174,8 +174,11 @@ AS_IF([test "x$with_tcmalloc" != xno],
 	       		 [Define if you have tcmalloc])
 	       HAVE_LIBTCMALLOC=1
 	     ],
-	    [AC_MSG_FAILURE(
-		  [no tcmalloc found (use --without-tcmalloc to disable)])])])
+	    [if test "x$with_tcmalloc" != xcheck; then
+	        AC_MSG_FAILURE(
+		  [--with-tcmalloc was given but test failed])
+	      fi
+	    ])])
 AM_CONDITIONAL(WITH_TCMALLOC, [test "$HAVE_LIBTCMALLOC" = "1"])
 
 # jni?
@@ -295,7 +298,7 @@ AC_ARG_WITH([gtk2],
         [with_gtk2=check])
 have_gtk2=no
 AS_IF([test "x$with_gtk2" != "xno"],
-        [PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4 >= 2.13],
+        [PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4 >= 2.12],
                 [have_gtk2=yes
 		AC_DEFINE([HAVE_GTK2], [1], [we have gtk2])
 		],

debian/changelog

@@ -1,5 +1,6 @@
-ceph (0.26~rc-1) experimental; urgency=low
+ceph (0.26-1) experimental; urgency=low
 
+  * New upstream release.
   * Make Ceph Linux only and build on all Linux archs (closes: #614890),
     but only build-depend google-perftools on x86 and x64 archs only.
   * Correct section of libcrush1, librados1, librbd1 and libceph1 to libs.
@@ -9,7 +10,7 @@ ceph (0.26~rc-1) experimental; urgency=low
   * Rename librados1{,-dbg,-dev} packages to librados2{,-dbg,-dev} ones;
     conflict with and replace the former ones.
 
- -- Laszlo Boszormenyi (GCS) <[email protected]>  Fri, 25 Mar 2011 19:42:11 +0100
+ -- Laszlo Boszormenyi (GCS) <[email protected]>  Fri, 01 Apr 2011 16:28:11 +0100
 
 ceph (0.25.2-1) experimental; urgency=low
 

src/mds/MDS.cc

@@ -850,7 +850,9 @@ void MDS::handle_mds_map(MMDSMap *m)
   addr = messenger->get_myaddr();
   whoami = mdsmap->get_rank_gid(monc->get_global_id());
   state = mdsmap->get_state_gid(monc->get_global_id());
-  dout(10) << "map says i am " << addr << " mds" << whoami << " state " << ceph_mds_state_name(state) << dendl;
+  incarnation = mdsmap->get_inc_gid(monc->get_global_id());
+  dout(10) << "map says i am " << addr << " mds" << whoami << "." << incarnation
+	   << " state " << ceph_mds_state_name(state) << dendl;
 
   // mark down any failed peers
   for (map<uint64_t,MDSMap::mds_info_t>::const_iterator p = oldmap->get_mds_info().begin();
@@ -899,7 +901,6 @@ void MDS::handle_mds_map(MMDSMap *m)
   }
 
   // ??
-  incarnation = mdsmap->get_inc(whoami);
 
   if (oldwhoami != whoami)
     dout_create_rank_symlink(whoami);

src/mds/MDSMap.h

@@ -468,6 +468,11 @@ class MDSMap {
       return mds_info[up[m]].inc;
     return 0;
   }
+  int get_inc_gid(uint64_t gid) {
+    if (mds_info.count(gid))
+      return mds_info[gid].inc;
+    return -1;
+  }
 
 
 

src/os/FileStore.cc

@@ -1490,7 +1490,8 @@ void FileStore::start_logger(int whoami, utime_t tare)
   char name[80];
   snprintf(name, sizeof(name), "osd.%d.fs.log", whoami);
   logger = new ProfLogger(name, (ProfLogType*)&fs_logtype);
-  journal->logger = logger;
+  if (journal)
+    journal->logger = logger;
   logger_add(logger);  
   logger_tare(tare);
   logger_start();
@@ -1500,7 +1501,8 @@ void FileStore::stop_logger()
 {
   dout(10) << "stop_logger" << dendl;
   if (logger) {
-    journal->logger = NULL;
+    if (journal)
+      journal->logger = NULL;
     logger_remove(logger);
     delete logger;
     logger = NULL;

src/osd/OSD.cc

@@ -4280,7 +4280,7 @@ void OSD::_process_pg_info(epoch_t epoch, int from,
 	queue_for_recovery(pg);  // in case we found something.
       }
     }
-    else if ((!log.empty()) && missing) {
+    else if (missing) {
       // PG is INACTIVE
       pg->proc_replica_log(*t, info, log, *missing, from);
 

src/osd/PG.cc

@@ -257,7 +257,7 @@ void PG::proc_replica_log(ObjectStore::Transaction& t, Info &oinfo, Log &olog, M
   }
 
   peer_info[from] = oinfo;
-  dout(10) << " peer osd" << from << " now " << oinfo << dendl;
+  dout(10) << " peer osd" << from << " now " << oinfo << " " << omissing << dendl;
   might_have_unfound.insert(from);
 
   search_for_missing(oinfo, &omissing, from);

src/rgw/rgw_cache.h

@@ -98,6 +98,7 @@ int RGWCache<T>::obj_stat(std::string& bucket, std::string& obj, uint64_t *psize
   bufferlist bl;
   uint64_t size;
   time_t mtime;
+  int64_t t;
 
   int r = cache.get(name, bl);
   if (r == 0) {
@@ -113,7 +114,7 @@ int RGWCache<T>::obj_stat(std::string& bucket, std::string& obj, uint64_t *psize
     return r;
   bl.clear();
   ::encode(size, bl);
-  int64_t t = (int64_t)mtime;
+  t = (int64_t)mtime;
   ::encode(t, bl);
   cache.put(name, bl);
 done: